Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into…

… devel
git-mirror · Dec 1, 2008 · 657e1de · 657e1de
2 parents 9398253 + 6f13d27
commit 657e1de
Show file tree

Hide file tree

Showing 27 changed files with 1,609 additions and 678 deletions.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -804,7 +804,7 @@ config HOTPLUG_CPU
 
 config LOCAL_TIMERS
 	bool "Use local timer interrupts"
-	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
+	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP)
 	default y
 	help
 	  Enable support for local timers on SMP platforms, rather then the