From c70b4c80b650fb88ab77527e21514b546f48ed27 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Fri, 28 Jan 2011 22:04:01 +0000 Subject: [PATCH] --- yaml --- r: 233899 b: refs/heads/master c: 0ce08870b8a4895044b6cf2bbdc774a6faaa3656 h: refs/heads/master i: 233897: d08fd52ebba1b6fe30120bba7d75f24e9df181d7 233895: 7befe290d777bde1a77774fc521f43dd3ca54569 v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 37a85387deb8..b81226398bca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5939d25ff296bd69fd98ead938cb63e467939040 +refs/heads/master: 0ce08870b8a4895044b6cf2bbdc774a6faaa3656 diff --git a/trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c index 84230e9ed962..e53b4b38bd11 100644 --- a/trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/trunk/arch/sh/kernel/cpu/sh4/setup-sh7750.c @@ -255,12 +255,17 @@ static struct platform_device *sh7750_early_devices[] __initdata = { void __init plat_early_device_setup(void) { + struct platform_device *dev[1]; + if (mach_is_rts7751r2d()) { scif_platform_data.scscr |= SCSCR_CKE1; - early_platform_add_devices(&scif_device, 1); + dev[0] = &scif_device; + early_platform_add_devices(dev, 1); } else { - early_platform_add_devices(&sci_device, 1); - early_platform_add_devices(&scif_device, 1); + dev[0] = &sci_device; + early_platform_add_devices(dev, 1); + dev[0] = &scif_device; + early_platform_add_devices(dev, 1); } early_platform_add_devices(sh7750_early_devices,