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 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
s5pc100_defconfig
diff --git
a/arch/arm/configs/s5pc100_defconfig
b/arch/arm/configs/s5pc100_defconfig
index b0d7d3d3a5e3f6a9ddbabaeb4a87b86cfb87d6fc..dc108afc060c0d433a3ab9c293d311f673c963c2 100644
(file)
--- a/
arch/arm/configs/s5pc100_defconfig
+++ b/
arch/arm/configs/s5pc100_defconfig
@@
-202,7
+202,6
@@
CONFIG_MACH_SMDKC100=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_V7=y
CONFIG_CPU_32v7=y