diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-01 15:54:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-01 18:49:02 -0400 |
| commit | 8302294f43250dc337108c51882a6007f2b1e2e0 (patch) | |
| tree | 85acd4440799c46a372df9cad170fa0c21e59096 /init/Kconfig | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
| parent | 2e572895bf3203e881356a4039ab0fa428ed2639 (diff) | |
Merge branch 'tracing/core-v2' into tracing-for-linus
Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 14c483d2b7c9..9d8cf2d2f840 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1005,7 +1005,7 @@ config TRACEPOINTS | |||
| 1005 | 1005 | ||
| 1006 | config MARKERS | 1006 | config MARKERS |
| 1007 | bool "Activate markers" | 1007 | bool "Activate markers" |
| 1008 | depends on TRACEPOINTS | 1008 | select TRACEPOINTS |
| 1009 | help | 1009 | help |
| 1010 | Place an empty function call at each marker site. Can be | 1010 | Place an empty function call at each marker site. Can be |
| 1011 | dynamically changed for a probe function. | 1011 | dynamically changed for a probe function. |