diff options
author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2013-06-07 10:03:37 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-08 02:38:24 -0400 |
commit | 9c3beaabb951d672b1534c7f56f84054b088f879 (patch) | |
tree | 72a386b534ab160e9e72aa4c0907884dd6b51353 /arch/sh/boards | |
parent | 24549e2a0f33628b5160eac16c6aebf1cfaf22f1 (diff) |
sh_eth: get SH7724 support out of #ifdef
Get the SH7724 code/data in the driver out of #ifdef by adding "r8a7724-ether"
to the platform driver's ID table. Change the Ether platform device's name in
the SH 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/sh/boards')
-rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 4 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 764530c85aa9..61fade0ffa96 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c | |||
@@ -165,8 +165,8 @@ static struct sh_eth_plat_data sh_eth_plat = { | |||
165 | }; | 165 | }; |
166 | 166 | ||
167 | static struct platform_device sh_eth_device = { | 167 | static struct platform_device sh_eth_device = { |
168 | .name = "sh-eth", | 168 | .name = "sh7724-ether", |
169 | .id = 0, | 169 | .id = 0, |
170 | .dev = { | 170 | .dev = { |
171 | .platform_data = &sh_eth_plat, | 171 | .platform_data = &sh_eth_plat, |
172 | }, | 172 | }, |
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 4010e63e82d8..b70180ef3e29 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c | |||
@@ -380,8 +380,8 @@ static struct sh_eth_plat_data sh_eth_plat = { | |||
380 | }; | 380 | }; |
381 | 381 | ||
382 | static struct platform_device sh_eth_device = { | 382 | static struct platform_device sh_eth_device = { |
383 | .name = "sh-eth", | 383 | .name = "sh7724-ether", |
384 | .id = 0, | 384 | .id = 0, |
385 | .dev = { | 385 | .dev = { |
386 | .platform_data = &sh_eth_plat, | 386 | .platform_data = &sh_eth_plat, |
387 | }, | 387 | }, |