Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / arch / mips / oprofile / Kconfig

diff --git a/arch/mips/oprofile/Kconfig b/arch/mips/oprofile/Kconfig
index 19d37730b664a03cc441886740dc517fd7349c2c..55feaf798596fa1e0119f52bcd5f9831506fbb6e 100644 (file)
--- a/arch/mips/oprofile/Kconfig
+++ b/arch/mips/oprofile/Kconfig
@@ -11,7 +11,7 @@ config PROFILING
 
 config OPROFILE
        tristate "OProfile system profiling (EXPERIMENTAL)"
-       depends on PROFILING
+       depends on PROFILING && EXPERIMENTAL
        help
          OProfile is a profiling system capable of profiling the
          whole system, include the kernel, kernel modules, libraries,