aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile/board-armadillo800eva.c
diff options
context:
space:
mode:
authorSergei Shtylyov <sergei.shtylyov@cogentembedded.com>2013-06-07 09:57:12 -0400
committerDavid S. Miller <davem@davemloft.net>2013-06-08 02:38:24 -0400
commite5c9b4cd665106d9b5397114ea81a53059410b6a (patch)
tree8a452830a7c8bc3cd21ffaf2c08c5d735f967f76 /arch/arm/mach-shmobile/board-armadillo800eva.c
parentc18a79abe31f555ec3b363b5b8c1d003230053b6 (diff)
sh_eth: get R8A7740 support out of #ifdef
Get the R8A7740 code/data in the driver out of #ifdef by adding "r8a7740-gether" to the platform driver's ID table. Change the GEther platform device's name in the ARM platform code accordingly. Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-shmobile/board-armadillo800eva.c')
-rw-r--r--arch/arm/mach-shmobile/board-armadillo800eva.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index b85b2882dbd0..2b04c8011e13 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -377,7 +377,7 @@ static struct resource sh_eth_resources[] = {
377}; 377};
378 378
379static struct platform_device sh_eth_device = { 379static struct platform_device sh_eth_device = {
380 .name = "sh-eth", 380 .name = "r8a7740-gether",
381 .id = -1, 381 .id = -1,
382 .dev = { 382 .dev = {
383 .platform_data = &sh_eth_platdata, 383 .platform_data = &sh_eth_platdata,