summaryrefslogtreecommitdiff
path: root/arch/sparc64/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-16 21:04:48 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-12-16 21:04:48 (GMT)
commit78f902ccc597d6ce3e8d1477d70f2d79e960ba7a (patch)
treec6ceab663de16501d1dda1c1596fe2dacaaef8e3 /arch/sparc64/Kconfig
parent9ee670fd87b7d69c8633b94c42aadcbbcb96f28e (diff)
parent8b1fae4e4200388b64dd88065639413cb3f1051c (diff)
downloadlinux-fsl-qoriq-78f902ccc597d6ce3e8d1477d70f2d79e960ba7a.tar.xz
Merge commit 'v2.6.28-rc8' into x86/doc
Diffstat (limited to 'arch/sparc64/Kconfig')
-rw-r--r--arch/sparc64/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 035b15a..3b96e70 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -11,8 +11,7 @@ config SPARC
config SPARC64
bool
default y
- select HAVE_DYNAMIC_FTRACE
- select HAVE_FTRACE
+ select HAVE_FUNCTION_TRACER
select HAVE_IDE
select HAVE_LMB
select HAVE_ARCH_KGDB