diff options
author | Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> | 2008-07-29 01:37:25 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-07-29 04:39:58 -0400 |
commit | 4864841a34ad77a5054f20d18453ae38a926afd8 (patch) | |
tree | 80ab3e3eaf3356b3fcb5f724a8bbb6e4120a8dd5 /arch/sh | |
parent | 6de9c6481d47c6da5f8b81f75a5c24c69c366f37 (diff) |
sh: Fix compile error of Solution Engine
When I compiled Solution Engine, this become compile error
because plaform device of sh_eth device becomes enable.
When sh7710/sh7712 which could use sh_eth was chosen,
revised it so that platform device of sh_eth device became enable.
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/se/770x/setup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/sh/boards/se/770x/setup.c b/arch/sh/boards/se/770x/setup.c index cf4a5ba12df4..6c64d774da3a 100644 --- a/arch/sh/boards/se/770x/setup.c +++ b/arch/sh/boards/se/770x/setup.c | |||
@@ -113,6 +113,8 @@ static struct platform_device heartbeat_device = { | |||
113 | .resource = heartbeat_resources, | 113 | .resource = heartbeat_resources, |
114 | }; | 114 | }; |
115 | 115 | ||
116 | #if defined(CONFIG_CPU_SUBTYPE_SH7710) ||\ | ||
117 | defined(CONFIG_CPU_SUBTYPE_SH7712) | ||
116 | /* SH771X Ethernet driver */ | 118 | /* SH771X Ethernet driver */ |
117 | static struct resource sh_eth0_resources[] = { | 119 | static struct resource sh_eth0_resources[] = { |
118 | [0] = { | 120 | [0] = { |
@@ -159,12 +161,16 @@ static struct platform_device sh_eth1_device = { | |||
159 | .num_resources = ARRAY_SIZE(sh_eth1_resources), | 161 | .num_resources = ARRAY_SIZE(sh_eth1_resources), |
160 | .resource = sh_eth1_resources, | 162 | .resource = sh_eth1_resources, |
161 | }; | 163 | }; |
164 | #endif | ||
162 | 165 | ||
163 | static struct platform_device *se_devices[] __initdata = { | 166 | static struct platform_device *se_devices[] __initdata = { |
164 | &heartbeat_device, | 167 | &heartbeat_device, |
165 | &cf_ide_device, | 168 | &cf_ide_device, |
169 | #if defined(CONFIG_CPU_SUBTYPE_SH7710) ||\ | ||
170 | defined(CONFIG_CPU_SUBTYPE_SH7712) | ||
166 | &sh_eth0_device, | 171 | &sh_eth0_device, |
167 | &sh_eth1_device, | 172 | &sh_eth1_device, |
173 | #endif | ||
168 | }; | 174 | }; |
169 | 175 | ||
170 | static int __init se_devices_setup(void) | 176 | static int __init se_devices_setup(void) |