Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 0e8ec2a..d6781ce 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -37,6 +37,9 @@ config SPARC64
        def_bool 64BIT
        select ARCH_SUPPORTS_MSI
        select HAVE_FUNCTION_TRACER
        def_bool 64BIT
        select ARCH_SUPPORTS_MSI
        select HAVE_FUNCTION_TRACER

+       select HAVE_FUNCTION_GRAPH_TRACER
+       select HAVE_FUNCTION_GRAPH_FP_TEST
+       select HAVE_FUNCTION_TRACE_MCOUNT_TEST

        select HAVE_KRETPROBES
        select HAVE_KPROBES
        select HAVE_LMB
        select HAVE_KRETPROBES
        select HAVE_KPROBES
        select HAVE_LMB


@@ -127,6 +130,9 @@ config ZONE_DMA
        bool
        default y if SPARC32
 
        bool
        default y if SPARC32
 

+config NEED_DMA_MAP_STATE
+       def_bool y
+

 config GENERIC_ISA_DMA
        bool
        default y if SPARC32
 config GENERIC_ISA_DMA
        bool
        default y if SPARC32