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 /arch/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 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 830c16a2b801..dc81b34c5d82 100644 --- a/arch/Kconfig +++ b/arch/Kconfig | |||
| @@ -6,6 +6,7 @@ config OPROFILE | |||
| 6 | tristate "OProfile system profiling (EXPERIMENTAL)" | 6 | tristate "OProfile system profiling (EXPERIMENTAL)" |
| 7 | depends on PROFILING | 7 | depends on PROFILING |
| 8 | depends on HAVE_OPROFILE | 8 | depends on HAVE_OPROFILE |
| 9 | depends on TRACING_SUPPORT | ||
| 9 | select TRACING | 10 | select TRACING |
| 10 | select RING_BUFFER | 11 | select RING_BUFFER |
| 11 | help | 12 | help |