diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-02 11:33:35 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-02 11:33:35 +1100 |
| commit | ef8c0f531f4d40658fd5854285b4c54e24cf6fb0 (patch) | |
| tree | 767fe053d4ff6e1e77c68e9c7c5f5b28cb7da5d7 | |
| parent | d2fc51dd4a2275cbc77fd47366ee0a7f9a4ad978 (diff) | |
| parent | 0ce08870b8a4895044b6cf2bbdc774a6faaa3656 (diff) | |
Merge remote branch 'sh-current/sh-fixes-for-linus'
| -rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7750.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c index 672944f5b19c..e53b4b38bd11 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c @@ -14,7 +14,7 @@ #include <linux/io.h> #include <linux/sh_timer.h> #include <linux/serial_sci.h> -#include <asm/machtypes.h> +#include <generated/machtypes.h> static struct resource rtc_resources[] = { [0] = { @@ -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, |