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 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
cm_x300_defconfig
diff --git
a/arch/arm/configs/cm_x300_defconfig
b/arch/arm/configs/cm_x300_defconfig
index a0170867130eb89f510e665dc948d58a89636154..a334069c7904ca7e02cdd9556fc7b8e489586f50 100644
(file)
--- a/
arch/arm/configs/cm_x300_defconfig
+++ b/
arch/arm/configs/cm_x300_defconfig
@@
-247,7
+247,6
@@
CONFIG_PLAT_PXA=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_XSC3=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y