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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
lpd7a400_defconfig
diff --git
a/arch/arm/configs/lpd7a400_defconfig
b/arch/arm/configs/lpd7a400_defconfig
index f8ac29d5c654221d336233f77fe9c6ec9368a266..6116feea2e127f70a09faf43838e92d130da12ef 100644
(file)
--- a/
arch/arm/configs/lpd7a400_defconfig
+++ b/
arch/arm/configs/lpd7a400_defconfig
@@
-95,7
+95,6
@@
CONFIG_LPD7A40X_CPLD_SSP=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM922T=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4T=y