diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 14:16:43 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-10-28 14:16:43 +0900 |
commit | d4d9781d1dd04ff134e3d43383dfa9991f7c54c6 (patch) | |
tree | 28e799ec49f72bf37f39d192d21f25bffb682aab /arch/sh | |
parent | f5a18f932e051ff0f19dcd80a421a4dd9b11f10f (diff) | |
parent | 396e6e49c58bb23d1814d3c240c736c9f01523c5 (diff) | |
download | op-kernel-dev-d4d9781d1dd04ff134e3d43383dfa9991f7c54c6.zip op-kernel-dev-d4d9781d1dd04ff134e3d43383dfa9991f7c54c6.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/include/asm/sh_eth.h | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/sh/include/asm/sh_eth.h b/arch/sh/include/asm/sh_eth.h deleted file mode 100644 index 0f325da..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)(unsigned long addr); - - unsigned char mac_addr[6]; - unsigned no_ether_link:1; - unsigned ether_link_active_low:1; -}; - -#endif |