Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest

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 0f325da0f923..000000000000
--- 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