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 remote branch 'linus/master' into x86/bootmem
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
colibri_pxa300_defconfig
diff --git
a/arch/arm/configs/colibri_pxa300_defconfig
b/arch/arm/configs/colibri_pxa300_defconfig
index
4774a36
..
11fdb5a
100644
(file)
--- a/
arch/arm/configs/colibri_pxa300_defconfig
+++ b/
arch/arm/configs/colibri_pxa300_defconfig
@@
-212,7
+212,6
@@
CONFIG_PXA3xx=y
#
# Processor Type
#
#
# Processor Type
#
-CONFIG_CPU_32=y
CONFIG_CPU_XSC3=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y
CONFIG_CPU_XSC3=y
CONFIG_CPU_32v5=y
CONFIG_CPU_ABRT_EV5T=y