diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:02 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-31 14:20:02 +0100 |
| commit | ceb0885d3b01bb2e2f18765770e212914f2864be (patch) | |
| tree | 0952c90cd49704a9172e985ca491d79b60c40bc8 /arch/arm/Kconfig | |
| parent | b31fc7af78e17b0203e1cd5a195c590e8adeae0d (diff) | |
| parent | 08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2 (diff) | |
| download | op-kernel-dev-ceb0885d3b01bb2e2f18765770e212914f2864be.zip op-kernel-dev-ceb0885d3b01bb2e2f18765770e212914f2864be.tar.gz | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/mm/init.c
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 4047f57..ba1ac08 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -57,7 +57,7 @@ config GENERIC_CLOCKEVENTS config GENERIC_CLOCKEVENTS_BROADCAST bool depends on GENERIC_CLOCKEVENTS - default y if SMP && !LOCAL_TIMERS + default y if SMP config HAVE_TCM bool @@ -1263,8 +1263,7 @@ config HW_PERF_EVENTS disabled, perf events will use software events only. config SPARSE_IRQ - bool "Support sparse irq numbering" - depends on EXPERIMENTAL + def_bool n help This enables support for sparse irqs. This is useful in general as most CPUs have a fairly sparse array of IRQ vectors, which @@ -1272,8 +1271,6 @@ config SPARSE_IRQ number of off-chip IRQs will want to treat this as experimental until they have been independently verified. - If you don't know what to do here, say N. - source "mm/Kconfig" config FORCE_MAX_ZONEORDER |
