summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/ixp23xx_defconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-24 12:57:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-24 12:57:45 -0800
commit756fe285070feb254a770cefc5640fe005ea9c27 (patch)
treec391c039bc8ef7ec6958017413aba250210e9af6 /arch/arm/configs/ixp23xx_defconfig
parenteec74a410fafd32c8f832d47dc196006ade68d05 (diff)
parented5a35acbb48d512332a53565e6341c65eecfa29 (diff)
downloadblackbird-op-linux-756fe285070feb254a770cefc5640fe005ea9c27.tar.gz
blackbird-op-linux-756fe285070feb254a770cefc5640fe005ea9c27.zip
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: VIDEO: cyberpro: pci_request_regions needs a persistent name ARM: dma-isa: request cascade channel after registering it ARM: footbridge: trim down old ISA rtc setup ARM: fix PAGE_KERNEL ARM: Fix wrong shared bit for CPU write buffer bug test ARM: 5857/1: ARM: dmabounce: fix build ARM: 5856/1: Fix bug of uart0 platfrom data for nuc900 ARM: 5855/1: putc support for nuc900 ARM: 5854/1: fix compiling error for NUC900 ARM: 5849/1: ARMv7: fix Oprofile events count ARM: add missing include to nwflash.c ARM: Kill CONFIG_CPU_32 ARM: Convert VFP/Crunch/XscaleCP thread_release() to exit_thread() ARM: 5853/1: ARM: Fix build break on ARM v6 and v7
Diffstat (limited to 'arch/arm/configs/ixp23xx_defconfig')
-rw-r--r--arch/arm/configs/ixp23xx_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/ixp23xx_defconfig b/arch/arm/configs/ixp23xx_defconfig
index ef97561ed75b..59c11c93180f 100644
--- a/arch/arm/configs/ixp23xx_defconfig
+++ b/arch/arm/configs/ixp23xx_defconfig
@@ -145,7 +145,6 @@ CONFIG_MACH_ROADRUNNER=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_XSC3=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
OpenPOWER on IntegriCloud