Merge branch 'misc' into devel

Conflicts:
	arch/arm/mm/init.c

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 4047f5724da3..ba1ac08b4e02 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