Fix merge problems

[karo-tx-uboot.git] / board / idmr / mii.c

diff --git a/board/idmr/mii.c b/board/idmr/mii.c
index f130e6e5368c09697235041bea2052fa92d372f2..78a7028bcfae36cff2240b198d0312d698e8d3d8 100644 (file)
--- a/board/idmr/mii.c
+++ b/board/idmr/mii.c
@@ -200,7 +200,7 @@ int mii_discover_phy(struct eth_device *dev)
 }
 #endif                         /* CFG_DISCOVER_PHY */
 
-int mii_init(void) __attribute__((weak,alias("__mii_init")));
+void mii_init(void) __attribute__((weak,alias("__mii_init")));
 
 void __mii_init(void)
 {