diff options
| author | merge <null@invalid> | 2009-03-04 12:53:41 +0000 |
|---|---|---|
| committer | Andy Green <agreen@octopus.localdomain> | 2009-03-04 12:53:41 +0000 |
| commit | cfebe723ca7e5810a2851fda2c305c5eeb6958e8 (patch) | |
| tree | ec4e7037dbfdb840341afc7d8e502fcf26954674 /arch/arm/Kconfig | |
| parent | 5faf7648227b6cec448972c53151c355c5014482 (diff) | |
MERGE-andy-tracking-patchset-edits
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2dfd1c28ae7..27d4dffc327 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1086,8 +1086,7 @@ endmenu menu "CPU Power Management" -if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA || \ - ARCH_S3C64XX) +if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA) source "drivers/cpufreq/Kconfig" @@ -1127,10 +1126,6 @@ config CPU_FREQ_PXA default y select CPU_FREQ_DEFAULT_GOV_USERSPACE -config CPU_FREQ_S3C64XX - bool "CPUfreq support for S3C64xx CPUs" - depends on CPU_FREQ && CPU_S3C6410 - endif source "drivers/cpuidle/Kconfig" |