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/kaber/nf-2.6
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
omap_generic_1610_defconfig
diff --git
a/arch/arm/configs/omap_generic_1610_defconfig
b/arch/arm/configs/omap_generic_1610_defconfig
index 0c42c8955047bebfe6e9810ea0f31cd8493be921..d773857ed0cd56a738576a5a10069826a42d0130 100644
(file)
--- a/
arch/arm/configs/omap_generic_1610_defconfig
+++ b/
arch/arm/configs/omap_generic_1610_defconfig
@@
-207,7
+207,6
@@
CONFIG_OMAP_ARM_192MHZ=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5TJ=y