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 'for-2.6.33' of git://linux-nfs.org/~bfields/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
sx1_defconfig
diff --git
a/arch/arm/configs/sx1_defconfig
b/arch/arm/configs/sx1_defconfig
index 25b007ff8bab36dbda7fae78272da9239bc1190c..8a9e7e6bd03b5d641619ddbf83d6418fd5e2c415 100644
(file)
--- a/
arch/arm/configs/sx1_defconfig
+++ b/
arch/arm/configs/sx1_defconfig
@@
-210,7
+210,6
@@
CONFIG_OMAP_ARM_168MHZ=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM925T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y