diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /arch/mips/oprofile/Kconfig | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
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 ca395ef06d4e..fb6f235348b0 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 && !!MIPS_MT_SMTC && 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, |