git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/lx6464es' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
viper_defconfig
diff --git
a/arch/arm/configs/viper_defconfig
b/arch/arm/configs/viper_defconfig
index 30f463d2fa8a9926bb04f21aadc9fe3d2aad3242..6ab5dd5868de5d6d6c33e19f26fe48fa6bf58755 100644
(file)
--- a/
arch/arm/configs/viper_defconfig
+++ b/
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