Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/Kconfig
parents 896f0c0e f875295c
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -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