net: sh_eth: move the asm/sh_eth.h to include/linux/

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sh/include/asm/sh_eth.h b/arch/sh/include/asm/sh_eth.h
deleted file mode 100644 (file)
index 2076acf..0000000
--- a/arch/sh/include/asm/sh_eth.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __ASM_SH_ETH_H__
-#define __ASM_SH_ETH_H__
-
-#include <linux/phy.h>
-
-enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN};
-enum {
-       SH_ETH_REG_GIGABIT,
-       SH_ETH_REG_FAST_SH4,
-       SH_ETH_REG_FAST_SH3_SH2
-};
-
-struct sh_eth_plat_data {
-       int phy;
-       int edmac_endian;
-       int register_type;
-       phy_interface_t phy_interface;
-       void (*set_mdio_gate)(void *addr);
-
-       unsigned char mac_addr[6];
-       unsigned no_ether_link:1;
-       unsigned ether_link_active_low:1;
-};
-
-#endif

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 38ccda55ea7e1139abe1e2dd6668323b897633ef..6aa0704fc26afc668a3290b571a102a29b35bf78 100644 (file)
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -35,6 +35,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/slab.h>
 #include <linux/ethtool.h>
+#include <linux/sh_eth.h>
 
 #include "sh_eth.h"
 

diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
index 78e586ecdeaa21d387d8cb003222c7ca8f858686..47877b13ffada62de5fb5575ae355cccd346a1ce 100644 (file)
--- a/drivers/net/ethernet/renesas/sh_eth.h
+++ b/drivers/net/ethernet/renesas/sh_eth.h
@@ -23,14 +23,6 @@
 #ifndef __SH_ETH_H__
 #define __SH_ETH_H__
 
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/spinlock.h>
-#include <linux/netdevice.h>
-#include <linux/phy.h>
-
-#include <asm/sh_eth.h>
-
 #define CARDNAME       "sh-eth"
 #define TX_TIMEOUT     (5*HZ)
 #define TX_RING_SIZE   64      /* Tx ring size */

diff --git a/include/linux/sh_eth.h b/include/linux/sh_eth.h
new file mode 100644 (file)
index 0000000..2076acf
--- /dev/null
+++ b/include/linux/sh_eth.h
@@ -0,0 +1,25 @@
+#ifndef __ASM_SH_ETH_H__
+#define __ASM_SH_ETH_H__
+
+#include <linux/phy.h>
+
+enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN};
+enum {
+       SH_ETH_REG_GIGABIT,
+       SH_ETH_REG_FAST_SH4,
+       SH_ETH_REG_FAST_SH3_SH2
+};
+
+struct sh_eth_plat_data {
+       int phy;
+       int edmac_endian;
+       int register_type;
+       phy_interface_t phy_interface;
+       void (*set_mdio_gate)(void *addr);
+
+       unsigned char mac_addr[6];
+       unsigned no_ether_link:1;
+       unsigned ether_link_active_low:1;
+};
+
+#endif