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 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
overo_defconfig
diff --git
a/arch/arm/configs/overo_defconfig
b/arch/arm/configs/overo_defconfig
index b3ea2c4c0f916b8b8feade5128c774359329e811..bf06d3660a306343553fd3bca9336e05f41f8bbd 100644
(file)
--- a/
arch/arm/configs/overo_defconfig
+++ b/
arch/arm/configs/overo_defconfig
@@
-217,7
+217,6
@@
CONFIG_MACH_OVERO=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_V7=y
CONFIG_CPU_32v7=y