diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-02-06 19:30:38 -0500 |
| commit | 1d9564ea0ac72ef7c4068d66fe42ad23af4ff53f (patch) | |
| tree | fa63b4c1bbd775252f71d05fef4de6a904eb4448 /arch/mips/oprofile/Kconfig | |
| parent | 87f440e70e07dace7db130f2f9fcea3f132aad8f (diff) | |
| parent | dda2ac15d23b38e4335e858848aa8c9a6710304f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/oprofile/Kconfig')
| -rw-r--r-- | arch/mips/oprofile/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/oprofile/Kconfig b/arch/mips/oprofile/Kconfig index 55feaf798596..ca395ef06d4e 100644 --- a/arch/mips/oprofile/Kconfig +++ b/arch/mips/oprofile/Kconfig | |||
| @@ -11,7 +11,7 @@ config PROFILING | |||
| 11 | 11 | ||
| 12 | config OPROFILE | 12 | config OPROFILE |
| 13 | tristate "OProfile system profiling (EXPERIMENTAL)" | 13 | tristate "OProfile system profiling (EXPERIMENTAL)" |
| 14 | depends on PROFILING && EXPERIMENTAL | 14 | depends on PROFILING && !!MIPS_MT_SMTC && EXPERIMENTAL |
| 15 | help | 15 | help |
| 16 | OProfile is a profiling system capable of profiling the | 16 | OProfile is a profiling system capable of profiling the |
| 17 | whole system, include the kernel, kernel modules, libraries, | 17 | whole system, include the kernel, kernel modules, libraries, |