summaryrefslogtreecommitdiff
path: root/arch/sh/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-16 22:57:41 +0300
committerIngo Molnar <mingo@elte.hu>2008-12-16 22:57:41 +0300
commitdd7a5230cd651bfb119d222561c4032f30dd5659 (patch)
tree85628ef75d1f512f43df6f760980b6cce6cf40c7 /arch/sh/Kconfig
parent050dc6944b9ca2186f4729ab44e0da3743933941 (diff)
parent8b1fae4e4200388b64dd88065639413cb3f1051c (diff)
downloadlinux-dd7a5230cd651bfb119d222561c4032f30dd5659.tar.xz
Merge commit 'v2.6.28-rc8' into x86/cpufeature
Diffstat (limited to 'arch/sh/Kconfig')
-rw-r--r--arch/sh/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index cb2c87df70ce..80119b3398e7 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -24,7 +24,7 @@ config SUPERH32
select HAVE_KPROBES
select HAVE_KRETPROBES
select HAVE_ARCH_TRACEHOOK
- select HAVE_FTRACE
+ select HAVE_FUNCTION_TRACER
config SUPERH64
def_bool y if CPU_SH5