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
ARM: Merge s3c24xx-updates2
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
ks8695_defconfig
diff --git
a/arch/arm/configs/ks8695_defconfig
b/arch/arm/configs/ks8695_defconfig
index d25c41bab06cccccf20cd3836c4aa03de289134d..e6f2276904f2e2ebe0c90558b3dfc3f2ca1dede8 100644
(file)
--- a/
arch/arm/configs/ks8695_defconfig
+++ b/
arch/arm/configs/ks8695_defconfig
@@
-186,7
+186,6
@@
CONFIG_MACH_DSM320=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM922T=y
CONFIG_CPU_32v4T=y
CONFIG_CPU_ABRT_EV4T=y