diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 18:16:02 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-10-16 18:16:02 +0900 |
| commit | 78aed4a63aaa67f22cb1b541dd7528139a24c289 (patch) | |
| tree | 56c0e18d498dee86ec9ff018d6070c8d08443be1 /arch/sh/Kconfig | |
| parent | 896f0c0e8e4ee02ee72a203aef79f362d5f7b7cc (diff) | |
| parent | f875295c4bfb39e96d136edd8ac80567e73536b4 (diff) | |
| download | linux-3.10-78aed4a63aaa67f22cb1b541dd7528139a24c289.tar.gz linux-3.10-78aed4a63aaa67f22cb1b541dd7528139a24c289.tar.bz2 linux-3.10-78aed4a63aaa67f22cb1b541dd7528139a24c289.zip | |
Merge branch 'sh/stable-updates'
Conflicts:
arch/sh/Kconfig
Diffstat (limited to '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 5260fb55ab7..266d422991e 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -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 |