diff options
author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2013-06-07 09:58:18 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-08 02:38:24 -0400 |
commit | f5d12767c8fd77e29d3d6771de59fd9ac3e540bb (patch) | |
tree | 11130a56372afa05518735c115c0198b47c13fb5 /arch/sh/boards | |
parent | e5c9b4cd665106d9b5397114ea81a53059410b6a (diff) |
sh_eth: get SH77{34|63} support out of #ifdef
Get the SH77{34|63} specific code/data in the driver out of #ifdef by adding
"sh7734-gether" and "sh7763-gether" to the platform driver's ID table. Note
that we have to split the 'struct sh_eth_cpu_data' instance into two due to
#ifdef inside it; note that we can kill the duplicate sh_eth_set_rate_gether().
Change the GEther 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/board-espt.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/mach-sh7763rdp/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/boards/board-espt.c b/arch/sh/boards/board-espt.c index d71a0bcf8145..4d94dff9015c 100644 --- a/arch/sh/boards/board-espt.c +++ b/arch/sh/boards/board-espt.c | |||
@@ -85,7 +85,7 @@ static struct sh_eth_plat_data sh7763_eth_pdata = { | |||
85 | }; | 85 | }; |
86 | 86 | ||
87 | static struct platform_device espt_eth_device = { | 87 | static struct platform_device espt_eth_device = { |
88 | .name = "sh-eth", | 88 | .name = "sh7763-gether", |
89 | .resource = sh_eth_resources, | 89 | .resource = sh_eth_resources, |
90 | .num_resources = ARRAY_SIZE(sh_eth_resources), | 90 | .num_resources = ARRAY_SIZE(sh_eth_resources), |
91 | .dev = { | 91 | .dev = { |
diff --git a/arch/sh/boards/mach-sh7763rdp/setup.c b/arch/sh/boards/mach-sh7763rdp/setup.c index b7c75298dfb5..50ba481fa240 100644 --- a/arch/sh/boards/mach-sh7763rdp/setup.c +++ b/arch/sh/boards/mach-sh7763rdp/setup.c | |||
@@ -93,7 +93,7 @@ static struct sh_eth_plat_data sh7763_eth_pdata = { | |||
93 | }; | 93 | }; |
94 | 94 | ||
95 | static struct platform_device sh7763rdp_eth_device = { | 95 | static struct platform_device sh7763rdp_eth_device = { |
96 | .name = "sh-eth", | 96 | .name = "sh7763-gether", |
97 | .resource = sh_eth_resources, | 97 | .resource = sh_eth_resources, |
98 | .num_resources = ARRAY_SIZE(sh_eth_resources), | 98 | .num_resources = ARRAY_SIZE(sh_eth_resources), |
99 | .dev = { | 99 | .dev = { |