git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
badge4_defconfig
diff --git
a/arch/arm/configs/badge4_defconfig
b/arch/arm/configs/badge4_defconfig
index
f264846
..
b175b6b
100644
(file)
--- a/
arch/arm/configs/badge4_defconfig
+++ b/
arch/arm/configs/badge4_defconfig
@@
-103,7
+103,6
@@
CONFIG_SA1100_BADGE4=y
#
# Processor Type
#
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_SA1100=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4=y
CONFIG_CPU_SA1100=y
CONFIG_CPU_32v4=y
CONFIG_CPU_ABRT_EV4=y