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 git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
s3c2410_defconfig
diff --git
a/arch/arm/configs/s3c2410_defconfig
b/arch/arm/configs/s3c2410_defconfig
index b49810461e41f7e90b57c9cb8de2ff833cbe2d49..2f10dae0279630b3e1da4c21fa99044d5fc57450 100644
(file)
--- a/
arch/arm/configs/s3c2410_defconfig
+++ b/
arch/arm/configs/s3c2410_defconfig
@@
-277,7
+277,6
@@
CONFIG_MACH_SMDK2443=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_ARM920T=y
CONFIG_CPU_ARM926T=y
CONFIG_CPU_32v4T=y