Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

[~andy/linux] / arch / sh / boards / board-sh7757lcr.c

diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c
index 41f86702eb9ff80dfd48e178b5b1e0cf287a4fa6..4f114d1cd0198ea78160adf44450c8420ac8cfa1 100644 (file)
--- a/arch/sh/boards/board-sh7757lcr.c
+++ b/arch/sh/boards/board-sh7757lcr.c
@@ -82,7 +82,7 @@ static struct sh_eth_plat_data sh7757_eth0_pdata = {
 };
 
 static struct platform_device sh7757_eth0_device = {
-       .name           = "sh-eth",
+       .name           = "sh7757-ether",
        .resource       = sh_eth0_resources,
        .id             = 0,
        .num_resources  = ARRAY_SIZE(sh_eth0_resources),
@@ -111,7 +111,7 @@ static struct sh_eth_plat_data sh7757_eth1_pdata = {
 };
 
 static struct platform_device sh7757_eth1_device = {
-       .name           = "sh-eth",
+       .name           = "sh7757-ether",
        .resource       = sh_eth1_resources,
        .id             = 1,
        .num_resources  = ARRAY_SIZE(sh_eth1_resources),
@@ -157,7 +157,7 @@ static struct sh_eth_plat_data sh7757_eth_giga0_pdata = {
 };
 
 static struct platform_device sh7757_eth_giga0_device = {
-       .name           = "sh-eth",
+       .name           = "sh7757-gether",
        .resource       = sh_eth_giga0_resources,
        .id             = 2,
        .num_resources  = ARRAY_SIZE(sh_eth_giga0_resources),
@@ -192,7 +192,7 @@ static struct sh_eth_plat_data sh7757_eth_giga1_pdata = {
 };
 
 static struct platform_device sh7757_eth_giga1_device = {
-       .name           = "sh-eth",
+       .name           = "sh7757-gether",
        .resource       = sh_eth_giga1_resources,
        .id             = 3,
        .num_resources  = ARRAY_SIZE(sh_eth_giga1_resources),