aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-24 23:56:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-24 23:56:18 -0400
commit8405b044e5238afebd7248d927c1d261d2239767 (patch)
tree56c6a3c1a4542ead63b4abdd9fe6629d849402d5 /arch/arm/Kconfig
parentee05eff6f79c25617e5b7d7677b8f79d26abbe37 (diff)
parent133de1211982bd2ba9ab401f7a73d25d052ccd61 (diff)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] s5pv210: make needlessly global symbols static [CPUFREQ] exynos4210: make needlessly global symbols static [CPUFREQ] S3C6410: Add some lower frequencies for 800MHz base clock operation [CPUFREQ] S5PV210: Add reboot notifier to prevent system hang [CPUFREQ] S5PV210: Adjust udelay prior to voltage scaling down [CPUFREQ] S5PV210: Lock a mutex while changing the cpu frequency [CPUFREQ] S5PV210: Add pm_notifier to prevent system unstable [CPUFREQ] S5PV210: Add arm/int voltage control support [CPUFREQ] S5PV210: Add additional symantics for "relation" in cpufreq with pm [CPUFREQ] S3C64xx: Notify transition complete as soon as frequency changed [CPUFREQ] S3C6410: Support 800MHz operation in cpufreq [CPUFREQ] s5pv210-cpufreq.c: Add missing clk_put [CPUFREQ] Move compile for S3C64XX cpufreq to /drivers/cpufreq [CPUFREQ] Remove some vi noise that escaped into the Makefile. [CPUFREQ] Move ARM Samsung cpufreq drivers to drivers/cpufreq/ [CPUFREQ/S3C64xx] Move S3C64xx CPUfreq driver into drivers/cpufreq [CPUFREQ] Handle CPUs with different capabilities in acpi-cpufreq
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1478c6171b00..83a7aa2ca57a 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1895,10 +1895,6 @@ config CPU_FREQ_PXA
1895 default y 1895 default y
1896 select CPU_FREQ_DEFAULT_GOV_USERSPACE 1896 select CPU_FREQ_DEFAULT_GOV_USERSPACE
1897 1897
1898config CPU_FREQ_S3C64XX
1899 bool "CPUfreq support for Samsung S3C64XX CPUs"
1900 depends on CPU_FREQ && CPU_S3C6410
1901
1902config CPU_FREQ_S3C 1898config CPU_FREQ_S3C
1903 bool 1899 bool
1904 help 1900 help