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.infradead.org/users/dwmw2/solos-2.6
[pandora-kernel.git]
/
arch
/
s390
/
defconfig
diff --git
a/arch/s390/defconfig
b/arch/s390/defconfig
index
fcba206
..
4e91a25
100644
(file)
--- a/
arch/s390/defconfig
+++ b/
arch/s390/defconfig
@@
-900,7
+900,7
@@
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_
FTRACE_SYSCALL
S=y
+CONFIG_HAVE_
SYSCALL_TRACEPOINT
S=y
CONFIG_TRACING_SUPPORT=y
CONFIG_FTRACE=y
# CONFIG_FUNCTION_TRACER is not set