Merge branch 'sh/stable-updates'

Conflicts:
	arch/sh/Kconfig
This commit is contained in:
Paul Mundt 2009-10-16 18:16:02 +09:00
commit 78aed4a63a

View file

@ -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