diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
| commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
| tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /arch/arm/configs/viper_defconfig | |
| parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
| parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'arch/arm/configs/viper_defconfig')
| -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 |