Merge branches 'fixes', 'misc' and 'smp-hotplug' into for-next

[zynq/linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 664e918e26249a6dd0a43fa1c80eaf187a040821..813d0428b37bc9951dd367be479e3bceb744f293 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1304,7 +1304,7 @@ config SCHED_SMT
 config HAVE_ARM_SCU
        bool
        help
-         This option enables support for the ARM system coherency unit
+         This option enables support for the ARM snoop control unit
 
 config HAVE_ARM_ARCH_TIMER
        bool "Architected timer support"
@@ -1316,7 +1316,6 @@ config HAVE_ARM_ARCH_TIMER
 
 config HAVE_ARM_TWD
        bool
-       select TIMER_OF if OF
        help
          This options enables support for the ARM timer and watchdog unit
 
@@ -1400,6 +1399,7 @@ config NR_CPUS
 config HOTPLUG_CPU
        bool "Support for hot-pluggable CPUs"
        depends on SMP
+       select GENERIC_IRQ_MIGRATION
        help
          Say Y here to experiment with turning CPUs off and on.  CPUs
          can be controlled through /sys/devices/system/cpu.