summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/pxa255-idp_defconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-01-23 07:45:46 +0100
committerDavid S. Miller <davem@davemloft.net>2010-01-23 07:45:46 +0100
commit6be325719b3e54624397e413efd4b33a997e55a3 (patch)
tree57f321a56794cab2222e179b16731e0d76a4a68a /arch/arm/configs/pxa255-idp_defconfig
parentbe2net: fix bug in rx page posting (diff)
parentLinux 2.6.33-rc5 (diff)
downloadlinux-6be325719b3e54624397e413efd4b33a997e55a3.tar.xz
linux-6be325719b3e54624397e413efd4b33a997e55a3.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/configs/pxa255-idp_defconfig')
-rw-r--r--arch/arm/configs/pxa255-idp_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/configs/pxa255-idp_defconfig b/arch/arm/configs/pxa255-idp_defconfig
index 46e5089df0ae..3365c5d77cad 100644
--- a/arch/arm/configs/pxa255-idp_defconfig
+++ b/arch/arm/configs/pxa255-idp_defconfig
@@ -92,7 +92,6 @@ CONFIG_PXA25x=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_XSCALE=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y