diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 05:16:02 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 05:16:02 -0400 |
| commit | 78aed4a63aaa67f22cb1b541dd7528139a24c289 (patch) | |
| tree | 56c0e18d498dee86ec9ff018d6070c8d08443be1 | |
| parent | 896f0c0e8e4ee02ee72a203aef79f362d5f7b7cc (diff) | |
| parent | f875295c4bfb39e96d136edd8ac80567e73536b4 (diff) | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/Kconfig
| -rw-r--r-- | arch/sh/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 5260fb55ab7f..266d422991e8 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -37,7 +37,6 @@ config SUPERH32 | |||
| 37 | select HAVE_FTRACE_MCOUNT_RECORD | 37 | select HAVE_FTRACE_MCOUNT_RECORD |
| 38 | select HAVE_DYNAMIC_FTRACE | 38 | select HAVE_DYNAMIC_FTRACE |
| 39 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST | 39 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST |
| 40 | select HAVE_FTRACE_SYSCALLS | ||
| 41 | select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE | 40 | select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE |
| 42 | select HAVE_FUNCTION_GRAPH_TRACER | 41 | select HAVE_FUNCTION_GRAPH_TRACER |
| 43 | select HAVE_ARCH_KGDB | 42 | select HAVE_ARCH_KGDB |