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
/
pleb_defconfig
diff --git
a/arch/arm/configs/pleb_defconfig
b/arch/arm/configs/pleb_defconfig
index f2d2dda25949ebe6ff2e90d2aa3bd2fbafbdc18c..dbfabb5eede88251bf6efeba482d5bd5e5246667 100644
(file)
--- a/
arch/arm/configs/pleb_defconfig
+++ b/
arch/arm/configs/pleb_defconfig
@@
-100,7
+100,6
@@
CONFIG_SA1100_PLEB=y
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_SA1100=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4=y