From d64f4fe9e6b2f85bd8f4928a63618d84ec3d6222 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 17 Apr 2009 11:37:10 +0200 Subject: [PATCH] --- yaml --- r: 144520 b: refs/heads/master c: 36b5437f33fb95196bef2345dede39fdcab3e431 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 6 ------ trunk/arch/arm/configs/viper_defconfig | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 18f49fd0cd07..3d2dcc4b469b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd87e081723089cba99df0b3d6f36ae2235c700a +refs/heads/master: 36b5437f33fb95196bef2345dede39fdcab3e431 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 9909a93ec7fd..fb667cd43f70 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -1169,12 +1169,6 @@ config CPU_FREQ_IMX If in doubt, say N. -config CPU_FREQ_PXA - bool - depends on CPU_FREQ && ARCH_PXA && PXA25x - default y - select CPU_FREQ_DEFAULT_GOV_USERSPACE - endif source "drivers/cpuidle/Kconfig" diff --git a/trunk/arch/arm/configs/viper_defconfig b/trunk/arch/arm/configs/viper_defconfig index 30f463d2fa8a..6ab5dd5868de 100644 --- a/trunk/arch/arm/configs/viper_defconfig +++ b/trunk/arch/arm/configs/viper_defconfig @@ -298,7 +298,6 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_ONDEMAND=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m -CONFIG_CPU_FREQ_PXA=y # # Floating point emulation