diff --git a/[refs] b/[refs] index dd8b6702a56a..d165ace1123c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 896f0c0e8e4ee02ee72a203aef79f362d5f7b7cc +refs/heads/master: 78aed4a63aaa67f22cb1b541dd7528139a24c289 diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index 5260fb55ab7f..266d422991e8 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/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