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 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
omap_h2_1610_defconfig
diff --git
a/arch/arm/configs/omap_h2_1610_defconfig
b/arch/arm/configs/omap_h2_1610_defconfig
index 74dbdc644d32bd81a9d502125e23cb53b64f8ad6..523189586a4bf62cd00a0c2bbbb903c35d36c212 100644
(file)
--- a/
arch/arm/configs/omap_h2_1610_defconfig
+++ b/
arch/arm/configs/omap_h2_1610_defconfig
@@
-231,7
+231,6
@@
CONFIG_OMAP_ARM_60MHZ=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y