]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sh: Fix compile error of Solution Engine
authorNobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com>
Tue, 29 Jul 2008 05:37:25 +0000 (14:37 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 29 Jul 2008 08:39:58 +0000 (17:39 +0900)
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>
arch/sh/boards/se/770x/setup.c

index cf4a5ba12df4f2c343dfa3b109ed1eb93f4ed49c..6c64d774da3a2aff1000a01506a8ab1d4fcc1d17 100644 (file)
@@ -113,6 +113,8 @@ static struct platform_device heartbeat_device = {
        .resource       = heartbeat_resources,
 };
 
+#if defined(CONFIG_CPU_SUBTYPE_SH7710) ||\
+       defined(CONFIG_CPU_SUBTYPE_SH7712)
 /* SH771X Ethernet driver */
 static struct resource sh_eth0_resources[] = {
        [0] = {
@@ -159,12 +161,16 @@ static struct platform_device sh_eth1_device = {
        .num_resources = ARRAY_SIZE(sh_eth1_resources),
        .resource = sh_eth1_resources,
 };
+#endif
 
 static struct platform_device *se_devices[] __initdata = {
        &heartbeat_device,
        &cf_ide_device,
+#if defined(CONFIG_CPU_SUBTYPE_SH7710) ||\
+       defined(CONFIG_CPU_SUBTYPE_SH7712)
        &sh_eth0_device,
        &sh_eth1_device,
+#endif
 };
 
 static int __init se_devices_setup(void)