---

yaml --- r: 145167 b: refs/heads/master c: c8a799b h: refs/heads/master i: 145165: b197fed 145163: 0dc175e 145159: 86bb406 145151: ae8d16e v: v3
git-mirror · May 12, 2009 · 99bc4c7 · 99bc4c7
1 parent 73940bd
commit 99bc4c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
 }