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 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
mx1_defconfig
diff --git
a/arch/arm/configs/mx1_defconfig
b/arch/arm/configs/mx1_defconfig
index 0200d67e30ba4126d217217627023cdcbaa76c2d..f5750703b70717868c16a033c3728280550fe86b 100644
(file)
--- a/
arch/arm/configs/mx1_defconfig
+++ b/
arch/arm/configs/mx1_defconfig
@@
-190,7
+190,6
@@
CONFIG_MXC_IRQ_PRIOR=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y