diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 06:25:51 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 06:25:51 -0500 |
| commit | 968ea6d80e395cf11a51143cfa1b9a14ada676df (patch) | |
| tree | dc2acec8c9bdced33afe1e273ee5e0b0b93d2703 /init/Kconfig | |
| parent | 7be7585393d311866653564fbcd10a3232773c0b (diff) | |
| parent | 8299608f140ae321e4eb5d1306184265d2b9511e (diff) | |
Merge ../linux-2.6-x86
Conflicts:
arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index 7656623f5006..b3782c6d5ede 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -808,6 +808,7 @@ config TRACEPOINTS | |||
| 808 | 808 | ||
| 809 | config MARKERS | 809 | config MARKERS |
| 810 | bool "Activate markers" | 810 | bool "Activate markers" |
| 811 | depends on TRACEPOINTS | ||
| 811 | help | 812 | help |
| 812 | Place an empty function call at each marker site. Can be | 813 | Place an empty function call at each marker site. Can be |
| 813 | dynamically changed for a probe function. | 814 | dynamically changed for a probe function. |