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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
omap_zoom3_defconfig
diff --git
a/arch/arm/configs/omap_zoom3_defconfig
b/arch/arm/configs/omap_zoom3_defconfig
index 0d7e37a3651bf01b7004af893a6b92fea3409124..a3e3c8274c9b0a070ba01f1a1307f99db7afdb20 100644
(file)
--- a/
arch/arm/configs/omap_zoom3_defconfig
+++ b/
arch/arm/configs/omap_zoom3_defconfig
@@
-236,7
+236,6
@@
CONFIG_MACH_OMAP_ZOOM3=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_V7=y
CONFIG_CPU_32v7=y