Merge branch 'sh/stable-updates'

Conflicts: arch/sh/Kconfig

Merge branch 'sh/stable-updates'
Conflicts: arch/sh/Kconfig
78aed4a6 · Paul Mundt · 896f0c0e · f875295c · 78aed4a6
Commit 78aed4a6 authored Oct 16, 2009 by Paul Mundt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

arch/sh/Kconfig arch/sh/Kconfig +0 -1

No files found.
--- 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