summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/cerfcube_defconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-12-25 14:15:31 +0100
committerTakashi Iwai <tiwai@suse.de>2009-12-25 14:15:31 +0100
commit52e04ea89da57274f0313d2bd73ba02f686cfdeb (patch)
tree6ce5d086bcaea4cb534b3fcf6ba736eb48d582a4 /arch/arm/configs/cerfcube_defconfig
parent41116e926cb92292fa4fcbe888ae8133fa0038e6 (diff)
parent8b90ca08821fee79e181bfcbc3bbd41ef5637136 (diff)
downloadblackbird-op-linux-52e04ea89da57274f0313d2bd73ba02f686cfdeb.tar.gz
blackbird-op-linux-52e04ea89da57274f0313d2bd73ba02f686cfdeb.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/arm/configs/cerfcube_defconfig')
-rw-r--r--arch/arm/configs/cerfcube_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/cerfcube_defconfig b/arch/arm/configs/cerfcube_defconfig
index 2b4c0668b1b4..d662cab9cc21 100644
--- a/arch/arm/configs/cerfcube_defconfig
+++ b/arch/arm/configs/cerfcube_defconfig
@@ -105,7 +105,6 @@ CONFIG_SA1100_CERF_FLASH_16MB=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_SA1100=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4=y
OpenPOWER on IntegriCloud