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 tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux
[pandora-kernel.git]
/
kernel
/
trace
/
Kconfig
diff --git
a/kernel/trace/Kconfig
b/kernel/trace/Kconfig
index
5e9efd4
..
015f85a
100644
(file)
--- a/
kernel/trace/Kconfig
+++ b/
kernel/trace/Kconfig
@@
-71,6
+71,7
@@
config TRACE_CLOCK
config RING_BUFFER
bool
select TRACE_CLOCK
+ select IRQ_WORK
config FTRACE_NMI_ENTER
bool
@@
-107,7
+108,6
@@
config TRACING
select BINARY_PRINTF
select EVENT_TRACING
select TRACE_CLOCK
- select IRQ_WORK
config GENERIC_TRACER
bool