Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

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

diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 5446e2a499b13d36e3e50a529e85cd0e91ad5de4..3b96e70b467033f43f6dc4b099bbf4e47c14a975 100644 (file)
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -11,8 +11,7 @@ config SPARC
 config SPARC64
        bool
        default y
-       select HAVE_DYNAMIC_FTRACE
-       select HAVE_FTRACE
+       select HAVE_FUNCTION_TRACER
        select HAVE_IDE
        select HAVE_LMB
        select HAVE_ARCH_KGDB
@@ -96,6 +95,7 @@ config GENERIC_HARDIRQS_NO__DO_IRQ
        def_bool y
 
 source "init/Kconfig"
+source "kernel/Kconfig.freezer"
 
 menu "Processor type and features"