net: sh_eth: move the asm/sh_eth.h to include/linux/
Subsystems (4)
PATCH 3/3 net: sh_eth: move the asm/sh_eth.h to include/linux/
Signed-off-by Yoshihiro Shimoda <[email protected]>
---
This patch is for net-next.
arch/sh/include/asm/sh_eth.h | 25 ------------------------- drivers/net/ethernet/renesas/sh_eth.c | 1 + drivers/net/ethernet/renesas/sh_eth.h | 8 -------- include/linux/sh_eth.h | 25 +++++++++++++++++++++++++ 4 files changed, 26 insertions(+), 33 deletions(-) delete mode 100644 arch/sh/include/asm/sh_eth.h create mode 100644 include/linux/sh_eth.h
arch/sh/include/asm/sh_eth.h deleted +0 -25
@@ -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
drivers/net/ethernet/renesas/sh_eth.c +1 -0
@@ -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"
drivers/net/ethernet/renesas/sh_eth.h +0 -8
@@ -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 */
include/linux/sh_eth.h new file +25 -0
@@ -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
Signature · 1 line
1.7.1
David Miller
AppliedFrom: Yoshihiro Shimoda <[email protected]>
Date: Wed, 28 Sep 2011 16:49:12 +0900
Quoted 1 line
Signed-off-by Yoshihiro Shimoda <[email protected]>
Applied.