diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-28 16:41:01 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-28 16:41:01 -0400 |
| commit | 10993374f84cc1c4100aea9eca7fa154518ffc5e (patch) | |
| tree | 0694a5c1119368b3bca4c17c5bc3a14a5bfa77e8 /arch/arm/configs | |
| parent | a133e775d533c0035af627693dec288f1b1d4ffc (diff) | |
| parent | fc76132b1e72efe45b5a5a693caadd54c3037f55 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/viper_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
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 |