Merge branch 'sh/stable-updates'

Conflicts: arch/sh/Kconfig
2009-10-16 18:16:02 +09:00 · 2009-10-16 18:16:02 +09:00 · 78aed4a63a
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@ -37,7 +37,6 @@ config SUPERH32
 	select HAVE_FTRACE_MCOUNT_RECORD
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_FUNCTION_TRACE_MCOUNT_TEST
-	select HAVE_FTRACE_SYSCALLS
 	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
 	select HAVE_FUNCTION_GRAPH_TRACER
 	select HAVE_ARCH_KGDB