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

[linux-2.6-block.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 26524b75970a3ef52bf7609fefa3626f07afcb2a..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