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' into for-next
[pandora-kernel.git]
/
arch
/
xtensa
/
configs
/
s6105_defconfig
diff --git
a/arch/xtensa/configs/s6105_defconfig
b/arch/xtensa/configs/s6105_defconfig
index
095cd80
..
42b7feb
100644
(file)
--- a/
arch/xtensa/configs/s6105_defconfig
+++ b/
arch/xtensa/configs/s6105_defconfig
@@
-598,7
+598,7
@@
CONFIG_DEBUG_NOMMU_REGIONS=y
# CONFIG_CONTEXT_SWITCH_TRACER is not set
# CONFIG_BOOT_TRACER is not set
# CONFIG_TRACE_BRANCH_PROFILING is not set
-# CONFIG_DYNAMIC_
PRINTK_
DEBUG is not set
+# CONFIG_DYNAMIC_DEBUG is not set
# CONFIG_SAMPLES is not set
#