2 files changed, 5 insertions, 5 deletions
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
index e0b740c831c7..bb11e1925178 100644
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -124,8 +124,8 @@ static struct resource eth_resources[] = {
 };
 static struct platform_device eth_device = {
-        .name = "sh-eth",
+        .name = "sh7619-ether",
-        .id     = -1,
+        .id = -1,
        .dev = {
                .platform_data = (void *)1,
        },
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index f26546aa1792..e0568a9352e5 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -680,9 +680,9 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
        .tsu            = 1,
        .select_mii     = 1,
 };
+#endif
-#elif defined(CONFIG_CPU_SUBTYPE_SH7619)
+static struct sh_eth_cpu_data sh7619_data = {
-static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
        .eesipr_value   = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
        .apr            = 1,
@@ -690,7 +690,6 @@ static struct sh_eth_cpu_data sh_eth_my_cpu_data = {
        .tpauser        = 1,
        .hw_swap        = 1,
 };
-#endif
 static struct sh_eth_cpu_data sh771x_data = {
        .eesipr_value   = DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
@@ -2700,6 +2699,7 @@ static const struct dev_pm_ops sh_eth_dev_pm_ops = {
 #endif
 static struct platform_device_id sh_eth_id_table[] = {
+        { "sh7619-ether", (kernel_ulong_t)&sh7619_data },
        { "sh771x-ether", (kernel_ulong_t)&sh771x_data },
        { CARDNAME },
        { }