diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-22 03:08:14 -0400 |
commit | debfcaf93ed500a051489db6646d71f29fe86a68 (patch) | |
tree | 7ba189b6dd654022ecc655b68e3c0a4573627706 /arch/sparc64/Kconfig | |
parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
parent | 81520a1b0649d0701205b818714a8c1e1cfbbb5b (diff) |
Merge branch 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'arch/sparc64/Kconfig')
-rw-r--r-- | arch/sparc64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig index 035b15af90d8..824f6122e1a5 100644 --- a/arch/sparc64/Kconfig +++ b/arch/sparc64/Kconfig | |||
@@ -12,7 +12,7 @@ config SPARC64 | |||
12 | bool | 12 | bool |
13 | default y | 13 | default y |
14 | select HAVE_DYNAMIC_FTRACE | 14 | select HAVE_DYNAMIC_FTRACE |
15 | select HAVE_FTRACE | 15 | select HAVE_FUNCTION_TRACER |
16 | select HAVE_IDE | 16 | select HAVE_IDE |
17 | select HAVE_LMB | 17 | select HAVE_LMB |
18 | select HAVE_ARCH_KGDB | 18 | select HAVE_ARCH_KGDB |