diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/viper_defconfig | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9909a93ec7fd..fb667cd43f70 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -1169,12 +1169,6 @@ config CPU_FREQ_IMX | |||
1169 | 1169 | ||
1170 | If in doubt, say N. | 1170 | If in doubt, say N. |
1171 | 1171 | ||
1172 | config CPU_FREQ_PXA | ||
1173 | bool | ||
1174 | depends on CPU_FREQ && ARCH_PXA && PXA25x | ||
1175 | default y | ||
1176 | select CPU_FREQ_DEFAULT_GOV_USERSPACE | ||
1177 | |||
1178 | endif | 1172 | endif |
1179 | 1173 | ||
1180 | source "drivers/cpuidle/Kconfig" | 1174 | source "drivers/cpuidle/Kconfig" |
diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig index 30f463d2fa8a..6ab5dd5868de 100644 --- a/arch/arm/configs/viper_defconfig +++ b/arch/arm/configs/viper_defconfig | |||
@@ -298,7 +298,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m | |||
298 | CONFIG_CPU_FREQ_GOV_USERSPACE=m | 298 | CONFIG_CPU_FREQ_GOV_USERSPACE=m |
299 | CONFIG_CPU_FREQ_GOV_ONDEMAND=m | 299 | CONFIG_CPU_FREQ_GOV_ONDEMAND=m |
300 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m | 300 | CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m |
301 | CONFIG_CPU_FREQ_PXA=y | ||
302 | 301 | ||
303 | # | 302 | # |
304 | # Floating point emulation | 303 | # Floating point emulation |