Prechádzať zdrojové kódy

Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/Kconfig
Paul Mundt 15 rokov pred
rodič
commit
78aed4a63a
1 zmenil súbory, kde vykonal 0 pridanie a 1 odobranie
  1. 0 1
      arch/sh/Kconfig

+ 0 - 1
arch/sh/Kconfig

@@ -37,7 +37,6 @@ config SUPERH32
 	select HAVE_FTRACE_MCOUNT_RECORD
 	select HAVE_FTRACE_MCOUNT_RECORD
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_DYNAMIC_FTRACE
 	select HAVE_FUNCTION_TRACE_MCOUNT_TEST
 	select HAVE_FUNCTION_TRACE_MCOUNT_TEST
-	select HAVE_FTRACE_SYSCALLS
 	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
 	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
 	select HAVE_FUNCTION_GRAPH_TRACER
 	select HAVE_FUNCTION_GRAPH_TRACER
 	select HAVE_ARCH_KGDB
 	select HAVE_ARCH_KGDB