diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 01:25:53 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-03-12 01:25:53 -0700 |
commit | 9c3c8afccb6a163fd2be739f511e863eab668702 (patch) | |
tree | e587a5377ada98fed8cfa6c8ee63125361f2818a /arch/sh/kernel/cpu/sh4/setup-sh7750.c | |
parent | 290293eda2c6dd368476d71433bdef07c39a6829 (diff) | |
parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
download | kernel_samsung_smdk4412-9c3c8afccb6a163fd2be739f511e863eab668702.zip kernel_samsung_smdk4412-9c3c8afccb6a163fd2be739f511e863eab668702.tar.gz kernel_samsung_smdk4412-9c3c8afccb6a163fd2be739f511e863eab668702.tar.bz2 |
Merge commit 'v2.6.38-rc8' into spi/next
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'arch/sh/kernel/cpu/sh4/setup-sh7750.c')
-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 672944f..e53b4b3 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, |