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/mason/btrfs-unstable
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
neocore926_defconfig
diff --git
a/arch/arm/configs/neocore926_defconfig
b/arch/arm/configs/neocore926_defconfig
index e0e4e98b5aa20104691eecd6cf37e9f271d81653..d165c757e44cd3aa47195db6be02a29f31b42dc8 100644
(file)
--- a/
arch/arm/configs/neocore926_defconfig
+++ b/
arch/arm/configs/neocore926_defconfig
@@
-218,7
+218,6
@@
CONFIG_AT91_EARLY_DBGU=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y