mediatek: fix compile error caused by upstreamed mtk_m32 function
authorYong-hyu, Ban <perillamint@quendi.moe>
Sun, 26 Apr 2020 09:43:22 +0000 (18:43 +0900)
committerHauke Mehrtens <hauke@hauke-m.de>
Mon, 27 Apr 2020 20:32:07 +0000 (22:32 +0200)
commit8fdf77878f46cac683115c10ee91956a35e61046
treeb3f09db27e9f999104ee98eba84dfa05895c43f0
parent1c008b61bd1284ea68abdc59173de484110986c9
mediatek: fix compile error caused by upstreamed mtk_m32 function

This fixes following compile error:

```
  CC      drivers/net/ethernet/mediatek/mtk_eth_soc.o
drivers/net/ethernet/mediatek/mtk_eth_soc.c:70:5: error: conflicting types for 'mtk_m32'
 u32 mtk_m32(struct mtk_eth *eth, u32 mask, u32 set, unsigned reg)
     ^~~~~~~
In file included from drivers/net/ethernet/mediatek/mtk_eth_soc.c:25:
drivers/net/ethernet/mediatek/mtk_eth_soc.h:964:6: note: previous declaration of 'mtk_m32' was here
 void mtk_m32(struct mtk_eth *eth, u32 clear, u32 set, unsigned reg);
      ^~~~~~~
```

which caused by 5.4.34 mainlining of mtk_m32 function.

Fixes: faf668be354a ("kernel: bump 5.4 to 5.4.34")
Signed-off-by: Yong-hyu, Ban <perillamint@quendi.moe>
target/linux/mediatek/patches-5.4/0999-hnat.patch