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

[cascardo/linux.git] / arch / avr32 / Kconfig

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index c1a868d..bdc3558 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -26,9 +26,6 @@ config AVR32
          There is an AVR32 Linux project with a web page at
          http://avr32linux.org/.
 
-config GENERIC_GPIO
-       def_bool y
-
 config STACKTRACE_SUPPORT
        def_bool y
 
@@ -250,20 +247,7 @@ config ARCH_SUSPEND_POSSIBLE
        def_bool y
 
 menu "CPU Frequency scaling"
-
 source "drivers/cpufreq/Kconfig"
-
-config CPU_FREQ_AT32AP
-       bool "CPU frequency driver for AT32AP"
-       depends on CPU_FREQ && PLATFORM_AT32AP
-       default n
-       help
-         This enables the CPU frequency driver for AT32AP processors.
-
-         For details, take a look in <file:Documentation/cpu-freq>.
-
-         If in doubt, say N.
-
 endmenu
 
 endmenu