diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-16 19:51:20 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-16 19:51:20 +0100 |
commit | cddb783552f51b5e39fc2db3a34d150d753758e4 (patch) | |
tree | c16ad1a9336d20200cf219954f1169dfae4aa84b /arch/arm/mach-omap2/devices.c | |
parent | b477dfba38bd54c47ea1fe128e2fa778ede1b2f5 (diff) | |
parent | 005187eecaa400b4b43d9f640fbde9fcc50f37c1 (diff) | |
download | kernel_samsung_smdk4412-cddb783552f51b5e39fc2db3a34d150d753758e4.zip kernel_samsung_smdk4412-cddb783552f51b5e39fc2db3a34d150d753758e4.tar.gz kernel_samsung_smdk4412-cddb783552f51b5e39fc2db3a34d150d753758e4.tar.bz2 |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 496983a..894cc35 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -354,10 +354,12 @@ static void omap_init_mcspi(void) platform_device_register(&omap2_mcspi1); platform_device_register(&omap2_mcspi2); #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3) - platform_device_register(&omap2_mcspi3); + if (cpu_is_omap2430() || cpu_is_omap343x()) + platform_device_register(&omap2_mcspi3); #endif #ifdef CONFIG_ARCH_OMAP3 - platform_device_register(&omap2_mcspi4); + if (cpu_is_omap343x()) + platform_device_register(&omap2_mcspi4); #endif } |