diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-08-06 12:00:10 +0300 |
|---|---|---|
| committer | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-08-06 12:00:10 +0300 |
| commit | 4071f29f97c01f697db9af9af71174d41e590136 (patch) | |
| tree | 87c445cdd3352b73b363044305a09fa4e7b42ac7 /init | |
| parent | f125e6991e097c19e19a8eea54ea9c54bfa83e10 (diff) | |
| parent | bbff2e433e80fae72c8d00d482927d52ec19ba33 (diff) | |
Merge branch 'slab/cleanups' into for-next
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 673e1cb3674a..75af60fcf519 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -962,7 +962,7 @@ config PERF_COUNTERS config EVENT_PROFILE bool "Tracepoint profile sources" - depends on PERF_COUNTERS && EVENT_TRACER + depends on PERF_COUNTERS && EVENT_TRACING default y endmenu |