Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc

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

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index cb2c87df70ceeb9d8c4558fbafde0e3b35eb9220..5c9cbfc14c4d5ad9ad06bf18f3a4b2f523eebd0b 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -24,7 +24,7 @@ config SUPERH32
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_ARCH_TRACEHOOK
-       select HAVE_FTRACE
+       select HAVE_FUNCTION_TRACER
 
 config SUPERH64
        def_bool y if CPU_SH5
@@ -55,6 +55,8 @@ config GENERIC_HARDIRQS
 
 config GENERIC_HARDIRQS_NO__DO_IRQ
        def_bool y
+       depends on SUPERH32 && (!SH_DREAMCAST && !SH_SH4202_MICRODEV && \
+                               !SH_7751_SYSTEMH && !HD64461)
 
 config GENERIC_IRQ_PROBE
        def_bool y