summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-10-22 09:08:14 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-22 09:08:14 +0200
commitdebfcaf93ed500a051489db6646d71f29fe86a68 (patch)
tree7ba189b6dd654022ecc655b68e3c0a4573627706 /arch/arm/Kconfig
parent2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff)
parent81520a1b0649d0701205b818714a8c1e1cfbbb5b (diff)
downloadblackbird-op-linux-debfcaf93ed500a051489db6646d71f29fe86a68.tar.gz
blackbird-op-linux-debfcaf93ed500a051489db6646d71f29fe86a68.zip
Merge branch 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index df39d20f7425..600733426ae0 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -16,8 +16,8 @@ config ARM
select HAVE_ARCH_KGDB
select HAVE_KPROBES if (!XIP_KERNEL)
select HAVE_KRETPROBES if (HAVE_KPROBES)
- select HAVE_FTRACE if (!XIP_KERNEL)
- select HAVE_DYNAMIC_FTRACE if (HAVE_FTRACE)
+ select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
+ select HAVE_DYNAMIC_FTRACE if (HAVE_FUNCTION_TRACER)
select HAVE_GENERIC_DMA_COHERENT
help
The ARM series is a line of low-power-consumption RISC chip designs
OpenPOWER on IntegriCloud