Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[sfrench/cifs-2.6.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 7a13c2cd7a86f31e8fcd53cbf22a0a29a40eb9b2..49fdc432512f572e985440a116188b69843faa80 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2087,53 +2087,6 @@ menu "CPU Power Management"
 
 if ARCH_HAS_CPUFREQ
 source "drivers/cpufreq/Kconfig"
-
-config CPU_FREQ_S3C
-       bool
-       help
-         Internal configuration node for common cpufreq on Samsung SoC
-
-config CPU_FREQ_S3C24XX
-       bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)"
-       depends on ARCH_S3C24XX && CPU_FREQ
-       select CPU_FREQ_S3C
-       help
-         This enables the CPUfreq driver for the Samsung S3C24XX family
-         of CPUs.
-
-         For details, take a look at <file:Documentation/cpu-freq>.
-
-         If in doubt, say N.
-
-config CPU_FREQ_S3C24XX_PLL
-       bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
-       depends on CPU_FREQ_S3C24XX
-       help
-         Compile in support for changing the PLL frequency from the
-         S3C24XX series CPUfreq driver. The PLL takes time to settle
-         after a frequency change, so by default it is not enabled.
-
-         This also means that the PLL tables for the selected CPU(s) will
-         be built which may increase the size of the kernel image.
-
-config CPU_FREQ_S3C24XX_DEBUG
-       bool "Debug CPUfreq Samsung driver core"
-       depends on CPU_FREQ_S3C24XX
-       help
-         Enable s3c_freq_dbg for the Samsung S3C CPUfreq core
-
-config CPU_FREQ_S3C24XX_IODEBUG
-       bool "Debug CPUfreq Samsung driver IO timing"
-       depends on CPU_FREQ_S3C24XX
-       help
-         Enable s3c_freq_iodbg for the Samsung S3C CPUfreq core
-
-config CPU_FREQ_S3C24XX_DEBUGFS
-       bool "Export debugfs for CPUFreq"
-       depends on CPU_FREQ_S3C24XX && DEBUG_FS
-       help
-         Export status information via debugfs.
-
 endif
 
 source "drivers/cpuidle/Kconfig"