diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 01:45:46 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 01:45:46 -0500 |
| commit | 6be325719b3e54624397e413efd4b33a997e55a3 (patch) | |
| tree | 57f321a56794cab2222e179b16731e0d76a4a68a /arch/arm/configs/dove_defconfig | |
| parent | 26d92f9276a56d55511a427fb70bd70886af647a (diff) | |
| parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/configs/dove_defconfig')
| -rw-r--r-- | arch/arm/configs/dove_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig index b3a491675d59..b7b2ab088dd9 100644 --- a/arch/arm/configs/dove_defconfig +++ b/arch/arm/configs/dove_defconfig | |||
| @@ -186,7 +186,6 @@ CONFIG_PLAT_ORION=y | |||
| 186 | # | 186 | # |
| 187 | # Processor Type | 187 | # Processor Type |
| 188 | # | 188 | # |
| 189 | CONFIG_CPU_32=y | ||
| 190 | CONFIG_CPU_V6=y | 189 | CONFIG_CPU_V6=y |
| 191 | CONFIG_CPU_32v6K=y | 190 | CONFIG_CPU_32v6K=y |
| 192 | CONFIG_CPU_32v6=y | 191 | CONFIG_CPU_32v6=y |