common: Move mii_init() function out of common.h

This function belongs in mii.h so move it over.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index 59d03b167c46e25e10f68a53869ab2b79cdcac9c..374fde6b65c0717ffe8d2933001e9cc60c07a3da 100644 (file)
--- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
+++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
@@ -39,6 +39,7 @@
 #include <fsl_validate.h>
 #endif
 #endif
+#include <linux/mii.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index e66fb16de8720e10556dc4b30640cb2abbf576a7..b2936b78d7b9a6dc7157d1c6deac8c9f0d2f08c3 100644 (file)
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -14,6 +14,7 @@
 #include <config.h>
 #include <net.h>
 #include <miiphy.h>
+#include <linux/mii.h>
 
 #undef ET_DEBUG
 #undef MII_DEBUG

diff --git a/drivers/net/ldpaa_eth/ls1088a.c b/drivers/net/ldpaa_eth/ls1088a.c
index c3260d318cc2f93bc1e3e436fe03c0fb4b9d4a34..54cb16e51b1f3d1bd6af6f5760b0235170d51728 100644 (file)
--- a/drivers/net/ldpaa_eth/ls1088a.c
+++ b/drivers/net/ldpaa_eth/ls1088a.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
+#include <linux/mii.h>
 
 u32 dpmac_to_devdisr[] = {
        [WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1,

diff --git a/drivers/net/ldpaa_eth/lx2160a.c b/drivers/net/ldpaa_eth/lx2160a.c
index 1fbeb0d14b6f429edaa01d77859c7f7eb7659dce..9432b6eb85c74987055233c1ec4933f3c7904ba8 100644 (file)
--- a/drivers/net/ldpaa_eth/lx2160a.c
+++ b/drivers/net/ldpaa_eth/lx2160a.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/arch/fsl_serdes.h>
 #include <asm/arch/soc.h>
+#include <linux/mii.h>
 
 u32 dpmac_to_devdisr[] = {
        [WRIOP1_DPMAC1] = FSL_CHASSIS3_DEVDISR2_DPMAC1,

diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index fb930412569c0c46b5ba6b53599a5248668c7bb0..9a3a8455a11af595375a85228825fced5a7f2055 100644 (file)
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -18,6 +18,7 @@
 
 #include <asm/fec.h>
 #include <asm/immap.h>
+#include <linux/mii.h>
 
 #undef ET_DEBUG
 #undef MII_DEBUG

diff --git a/drivers/net/mcfmii.c b/drivers/net/mcfmii.c
index 961618b4109c62f26a116b21302832b30f03b25f..b8af2cc44bed9bfcc8637cf8a521900f5beb5a2f 100644 (file)
--- a/drivers/net/mcfmii.c
+++ b/drivers/net/mcfmii.c
@@ -15,6 +15,7 @@
 #include <asm/fec.h>
 #endif
 #include <asm/immap.h>
+#include <linux/mii.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/drivers/net/mpc8xx_fec.c b/drivers/net/mpc8xx_fec.c
index f45f1e4677388d3ffb0b6972d22cd6212149eda6..0a8098519226abc51460c10fa5e5c873cfca23ed 100644 (file)
--- a/drivers/net/mpc8xx_fec.c
+++ b/drivers/net/mpc8xx_fec.c
@@ -13,6 +13,7 @@
 #include <asm/io.h>
 
 #include <phy.h>
+#include <linux/mii.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 

diff --git a/drivers/net/pic32_eth.c b/drivers/net/pic32_eth.c
index b0f767715459082bab931a5bd3b3ab6bbb0f944a..39c4b10ab837381889b069370213952319f4223f 100644 (file)
--- a/drivers/net/pic32_eth.c
+++ b/drivers/net/pic32_eth.c
@@ -12,6 +12,7 @@
 #include <time.h>
 #include <wait_bit.h>
 #include <asm/gpio.h>
+#include <linux/mii.h>
 
 #include "pic32_eth.h"
 

diff --git a/include/common.h b/include/common.h
index cc5f13ec7e76f1cb95f6dcac4f7886919de20a2c..992675100d54c9976040275160d46e876a56e6a9 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -254,9 +254,6 @@ void        reset_timer        (void);
 void   enable_interrupts  (void);
 int    disable_interrupts (void);
 
-/* $(CPU)/.../<eth> */
-void mii_init (void);
-
 /* arch/$(ARCH)/lib/cache.c */
 void   enable_caches(void);
 void   flush_cache   (unsigned long, unsigned long);

diff --git a/include/linux/mii.h b/include/linux/mii.h
index 21db032340e8cc77406f665be2fb687f35266269..49e29ac314a50a6e742a18660d14eeab47cd8ecc 100644 (file)
--- a/include/linux/mii.h
+++ b/include/linux/mii.h
@@ -225,4 +225,6 @@ static inline u8 mii_resolve_flowctrl_fdx(u16 lcladv, u16 rmtadv)
        return cap;
 }
 
+void mii_init(void);
+
 #endif /* __LINUX_MII_H__ */