Skip to content

Commit

Permalink
Merge branch 'sh/stable-updates'
Browse files Browse the repository at this point in the history 
Conflicts:
	arch/sh/Kconfig
  • Loading branch information
Paul Mundt committed Oct 16, 2009
2 parents 896f0c0 + f875295 commit 78aed4a
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/sh/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 78aed4a

Please sign in to comment.