diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-10 17:38:27 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-10 17:38:27 -0400 |
| commit | 1ee73784b656386a8c4c261282716c3b9019aea0 (patch) | |
| tree | d1356e7ed9123ec941910645250fe5c9eec9a6d6 /arch/arm/Kconfig | |
| parent | 7698fdedcfa3cab3dd40c9b685590b23be02e267 (diff) | |
| parent | b5495610669984af931055e49c1c1d2957950335 (diff) | |
Merge branch 'for_rmk' of git://dev.omapzoom.org/pub/scm/santosh/kernel-omap4-base into devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 646a5d5eb8c1..8381bd793146 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -846,10 +846,10 @@ source "kernel/time/Kconfig" | |||
| 846 | 846 | ||
| 847 | config SMP | 847 | config SMP |
| 848 | bool "Symmetric Multi-Processing (EXPERIMENTAL)" | 848 | bool "Symmetric Multi-Processing (EXPERIMENTAL)" |
| 849 | depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP) | 849 | depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP ||ARCH_OMAP4) |
| 850 | depends on GENERIC_CLOCKEVENTS | 850 | depends on GENERIC_CLOCKEVENTS |
| 851 | select USE_GENERIC_SMP_HELPERS | 851 | select USE_GENERIC_SMP_HELPERS |
| 852 | select HAVE_ARM_SCU if ARCH_REALVIEW | 852 | select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4) |
| 853 | help | 853 | help |
| 854 | This enables support for systems with more than one CPU. If you have | 854 | This enables support for systems with more than one CPU. If you have |
| 855 | a system with only one CPU, like most personal computers, say N. If | 855 | a system with only one CPU, like most personal computers, say N. If |
| @@ -917,9 +917,9 @@ config HOTPLUG_CPU | |||
| 917 | 917 | ||
| 918 | config LOCAL_TIMERS | 918 | config LOCAL_TIMERS |
| 919 | bool "Use local timer interrupts" | 919 | bool "Use local timer interrupts" |
| 920 | depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP) | 920 | depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP || ARCH_OMAP4) |
| 921 | default y | 921 | default y |
| 922 | select HAVE_ARM_TWD if ARCH_REALVIEW | 922 | select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4) |
| 923 | help | 923 | help |
| 924 | Enable support for local timers on SMP platforms, rather then the | 924 | Enable support for local timers on SMP platforms, rather then the |
| 925 | legacy IPI broadcast method. Local timers allows the system | 925 | legacy IPI broadcast method. Local timers allows the system |