Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / arch / powerpc / oprofile / Kconfig

diff --git a/arch/powerpc/oprofile/Kconfig b/arch/powerpc/oprofile/Kconfig
index 19d37730b664a03cc441886740dc517fd7349c2c..d03c0e5ca8705fc56a501c6ce39230d6f7e80a22 100644 (file)
--- a/arch/powerpc/oprofile/Kconfig
+++ b/arch/powerpc/oprofile/Kconfig
@@ -1,8 +1,5 @@
-
-menu "Profiling support"
-       depends on EXPERIMENTAL
-
 config PROFILING
+       depends on !PPC_ISERIES
        bool "Profiling support (EXPERIMENTAL)"
        help
          Say Y here to enable the extended profiling support mechanisms used
@@ -19,5 +16,3 @@ config OPROFILE
 
          If unsure, say N.
 
-endmenu
-