From 99bc4c7609f601ec72ef90e96b7e2a52bdc28816 Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Tue, 12 May 2009 11:20:02 -0700 Subject: [PATCH] --- yaml --- r: 145167 b: refs/heads/master c: c8a799b03a981b4b27d8fd7320c96cfbe781b2fb h: refs/heads/master i: 145165: b197fed6e11d43d486b20b05e9479e402c54a450 145163: 0dc175ec7cb4e215906cee61e684ce1337e5cfc4 145159: 86bb406783a0faff2baf96d2db58b2f67bd44684 145151: ae8d16e53b322b41d79a49662cfa845824eed738 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/devices.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c18dfa0ecb8b..26047b4cb85a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eaf9393bb79a9c7c8e708669f9581ca466122430 +refs/heads/master: c8a799b03a981b4b27d8fd7320c96cfbe781b2fb diff --git a/trunk/arch/arm/mach-omap2/devices.c b/trunk/arch/arm/mach-omap2/devices.c index 496983ade97e..894cc355818a 100644 --- a/trunk/arch/arm/mach-omap2/devices.c +++ b/trunk/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 }