diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-03-01 13:13:21 +0300 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-03-01 13:22:45 +0300 |
| commit | 86d62b6fa2845725ad88b95387c8c52731fb2460 (patch) | |
| tree | e8b4446e1716037fdf9ccdb52e23efed58a3223c /init | |
| parent | 3d083407a16698de86b42aee0da2ffb280b5cb7e (diff) | |
| parent | cfc9c0b450176a077205ef39092f0dc1a04e020a (diff) | |
| download | linux-86d62b6fa2845725ad88b95387c8c52731fb2460.tar.xz | |
Merge remote branch 'tip/oprofile' into tip/perf/core
Signed-off-by: Robert Richter <robert.richter@amd.com>
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 ada48441aff8..cf2dc3cd4f04 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1099,7 +1099,7 @@ config MMAP_ALLOW_UNINITIALIZED See Documentation/nommu-mmap.txt for more information. config PROFILING - bool "Profiling support (EXPERIMENTAL)" + bool "Profiling support" help Say Y here to enable the extended profiling support mechanisms used by profilers such as OProfile. |