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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
[pandora-kernel.git]
/
arch
/
arm
/
configs
/
lpd7a404_defconfig
diff --git
a/arch/arm/configs/lpd7a404_defconfig
b/arch/arm/configs/lpd7a404_defconfig
index
3a57be3
..
7a2e932
100644
(file)
--- a/
arch/arm/configs/lpd7a404_defconfig
+++ b/
arch/arm/configs/lpd7a404_defconfig
@@
-148,7
+148,6
@@
CONFIG_ARM_AMBA=y
# Kernel Features
#
CONFIG_PREEMPT=y
# Kernel Features
#
CONFIG_PREEMPT=y
-# CONFIG_NO_IDLE_HZ is not set
# CONFIG_AEABI is not set
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_AEABI is not set
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
CONFIG_SELECT_MEMORY_MODEL=y
@@
-1100,7
+1099,6
@@
CONFIG_FRAME_POINTER=y
CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_DEBUG_USER=y
CONFIG_FORCED_INLINING=y
# CONFIG_RCU_TORTURE_TEST is not set
CONFIG_DEBUG_USER=y
-# CONFIG_DEBUG_WAITQ is not set
CONFIG_DEBUG_ERRORS=y
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_ERRORS=y
# CONFIG_DEBUG_LL is not set