Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

[karo-tx-linux.git] / arch / sh / Kconfig

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index f9391a692ef69bbf554e43c62e286847999a5d0f..8c868cf2cf93febf478cc199e2a996ff64b244d1 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -33,6 +33,7 @@ config SUPERH
        select GENERIC_ATOMIC64
        select GENERIC_IRQ_SHOW
        select GENERIC_SMP_IDLE_THREAD
+       select GENERIC_IDLE_POLL_SETUP
        select GENERIC_CLOCKEVENTS
        select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST
        select GENERIC_STRNCPY_FROM_USER
@@ -145,9 +146,6 @@ config ARCH_HAS_ILOG2_U32
 config ARCH_HAS_ILOG2_U64
        def_bool n
 
-config ARCH_HAS_DEFAULT_IDLE
-       def_bool y
-
 config NO_IOPORT
        def_bool !PCI
        depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
@@ -621,25 +619,7 @@ config SH_CLK_CPG_LEGACY
 endmenu
 
 menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
-
-config SH_CPU_FREQ
-       tristate "SuperH CPU Frequency driver"
-       depends on CPU_FREQ
-       select CPU_FREQ_TABLE
-       help
-         This adds the cpufreq driver for SuperH. Any CPU that supports
-         clock rate rounding through the clock framework can use this
-         driver. While it will make the kernel slightly larger, this is
-         harmless for CPUs that don't support rate rounding. The driver
-         will also generate a notice in the boot log before disabling
-         itself if the CPU in question is not capable of rate rounding.
-
-         For details, take a look at <file:Documentation/cpu-freq>.
-
-         If unsure, say N.
-
 endmenu
 
 source "arch/sh/drivers/Kconfig"