Skip to content

L
linux
Commit 78aed4a6 authored by Paul Mundt's avatar Paul Mundt
Browse files
Options

Merge branch 'sh/stable-updates' 

Conflicts:
	arch/sh/Kconfig
parents 896f0c0e f875295c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
arch/sh/Kconfig
View file @ 78aed4a6
...@@ -37,7 +37,6 @@ config SUPERH32 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7