diff options
-rw-r--r-- | arch/sh/boards/mach-se/770x/setup.c | 8 | ||||
-rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/arch/sh/boards/mach-se/770x/setup.c b/arch/sh/boards/mach-se/770x/setup.c index 9759d6ba7ffb..658326f44df8 100644 --- a/arch/sh/boards/mach-se/770x/setup.c +++ b/arch/sh/boards/mach-se/770x/setup.c | |||
@@ -128,8 +128,8 @@ static struct resource sh_eth0_resources[] = { | |||
128 | }; | 128 | }; |
129 | 129 | ||
130 | static struct platform_device sh_eth0_device = { | 130 | static struct platform_device sh_eth0_device = { |
131 | .name = "sh-eth", | 131 | .name = "sh771x-ether", |
132 | .id = 0, | 132 | .id = 0, |
133 | .dev = { | 133 | .dev = { |
134 | .platform_data = PHY_ID, | 134 | .platform_data = PHY_ID, |
135 | }, | 135 | }, |
@@ -151,8 +151,8 @@ static struct resource sh_eth1_resources[] = { | |||
151 | }; | 151 | }; |
152 | 152 | ||
153 | static struct platform_device sh_eth1_device = { | 153 | static struct platform_device sh_eth1_device = { |
154 | .name = "sh-eth", | 154 | .name = "sh771x-ether", |
155 | .id = 1, | 155 | .id = 1, |
156 | .dev = { | 156 | .dev = { |
157 | .platform_data = PHY_ID, | 157 | .platform_data = PHY_ID, |
158 | }, | 158 | }, |
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index cf062de40b65..f26546aa1792 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c | |||
@@ -690,12 +690,12 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = { | |||
690 | .tpauser = 1, | 690 | .tpauser = 1, |
691 | .hw_swap = 1, | 691 | .hw_swap = 1, |
692 | }; | 692 | }; |
693 | #elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712) | 693 | #endif |
694 | static struct sh_eth_cpu_data sh_eth_my_cpu_data = { | 694 | |
695 | static struct sh_eth_cpu_data sh771x_data = { | ||
695 | .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff, | 696 | .eesipr_value = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff, |
696 | .tsu = 1, | 697 | .tsu = 1, |
697 | }; | 698 | }; |
698 | #endif | ||
699 | 699 | ||
700 | static void sh_eth_set_default_cpu_data(struct sh_eth_cpu_data *cd) | 700 | static void sh_eth_set_default_cpu_data(struct sh_eth_cpu_data *cd) |
701 | { | 701 | { |
@@ -2700,6 +2700,7 @@ static const struct dev_pm_ops sh_eth_dev_pm_ops = { | |||
2700 | #endif | 2700 | #endif |
2701 | 2701 | ||
2702 | static struct platform_device_id sh_eth_id_table[] = { | 2702 | static struct platform_device_id sh_eth_id_table[] = { |
2703 | { "sh771x-ether", (kernel_ulong_t)&sh771x_data }, | ||
2703 | { CARDNAME }, | 2704 | { CARDNAME }, |
2704 | { } | 2705 | { } |
2705 | }; | 2706 | }; |