From 8c1ef1a9780f4332b60a342f9dc8e8fd03a2f6f5 Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin@rab.in>
Date: Tue, 10 Aug 2010 19:58:17 +0100
Subject: [PATCH] --- yaml --- r: 212400 b: refs/heads/master c:
 80be7a7f642719bf99fc49692fc77d6333f51a73 h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/arch/arm/Kconfig | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b06f7c8ac175..fe717dc1c11e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72dc43a9eb123d2742bd413c80dbeab0c588f622
+refs/heads/master: 80be7a7f642719bf99fc49692fc77d6333f51a73
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 92951103255a..8d09765ce564 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -19,6 +19,8 @@ config ARM
 	select HAVE_KPROBES if (!XIP_KERNEL)
 	select HAVE_KRETPROBES if (HAVE_KPROBES)
 	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
+	select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
+	select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL)
 	select HAVE_GENERIC_DMA_COHERENT
 	select HAVE_KERNEL_GZIP
 	select HAVE_KERNEL_LZO