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
/
u8500_defconfig
diff --git
a/arch/arm/configs/u8500_defconfig
b/arch/arm/configs/u8500_defconfig
index 15fde22ce3f355581a6bc699036627ff458c683c..727aff9fe3476c5dd53ea0b86ec060393bfb36e6 100644
(file)
--- a/
arch/arm/configs/u8500_defconfig
+++ b/
arch/arm/configs/u8500_defconfig
@@
-201,7
+201,6
@@
CONFIG_MACH_U8500_MOP=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_V7=y
CONFIG_CPU_32v7=y