git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
mx31pdk_defconfig
diff --git
a/arch/arm/configs/mx31pdk_defconfig
b/arch/arm/configs/mx31pdk_defconfig
index 95ffc0db95a011c2f07d9af29ecff1300b131102..d40953798d9ed3d4ae7599885fb3bc94157f128b 100644
(file)
--- a/
arch/arm/configs/mx31pdk_defconfig
+++ b/
arch/arm/configs/mx31pdk_defconfig
@@
-173,7
+173,6
@@
CONFIG_MACH_MX31_3DS=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_V6=y
# CONFIG_CPU_32v6K is not set
CONFIG_CPU_32v6=y