Merge commit 'v2.6.30-rc1' into x86/urgent

[mv-sheeva.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index 830c16a2b801d38795139b941f277011e760ba37..dc81b34c5d82e72c574217d4b63bfda319e14530 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -6,6 +6,7 @@ config OPROFILE
        tristate "OProfile system profiling (EXPERIMENTAL)"
        depends on PROFILING
        depends on HAVE_OPROFILE
+       depends on TRACING_SUPPORT
        select TRACING
        select RING_BUFFER
        help