Merge commit 'v2.6.28-rc1' into sched/urgent

[karo-tx-linux.git] / arch / sparc64 / Kconfig.debug

diff --git a/arch/sparc64/Kconfig.debug b/arch/sparc64/Kconfig.debug
index 6a4d28a4076d0df87e637a3292a21fefcd8bd07a..d6d32d178fc8af2533939225caf2b7e6d8fef2b8 100644 (file)
--- a/arch/sparc64/Kconfig.debug
+++ b/arch/sparc64/Kconfig.debug
@@ -33,7 +33,7 @@ config DEBUG_PAGEALLOC
 
 config MCOUNT
        bool
-       depends on STACK_DEBUG
+       depends on STACK_DEBUG || FTRACE
        default y
 
 config FRAME_POINTER