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 branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-stream...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
omap_h4_2420_defconfig
diff --git
a/arch/arm/configs/omap_h4_2420_defconfig
b/arch/arm/configs/omap_h4_2420_defconfig
index a4aab8e4c29bad3e4cd503fb298066d1571fa137..b12b406c196063a09c16e849df3b01496a5d8de0 100644
(file)
--- a/
arch/arm/configs/omap_h4_2420_defconfig
+++ b/
arch/arm/configs/omap_h4_2420_defconfig
@@
-201,7
+201,6
@@
CONFIG_MACH_OMAP_H4=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_V6=y
# CONFIG_CPU_32v6K is not set
CONFIG_CPU_32v6=y