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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
nuc960_defconfig
diff --git
a/arch/arm/configs/nuc960_defconfig
b/arch/arm/configs/nuc960_defconfig
index 4b2cd9eae9bc7abed00328fbeb9ce7f0c59e39c0..aa7e128f5d79ab55bcd92516c3b36ff1af2076e6 100644
(file)
--- a/
arch/arm/configs/nuc960_defconfig
+++ b/
arch/arm/configs/nuc960_defconfig
@@
-201,7
+201,6
@@
CONFIG_MACH_W90N960EVB=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y