From 5838d8fcb0fcd4852ee1190794004e2d7fe69ce8 Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Wed, 1 Oct 2008 13:57:14 -0700
Subject: [PATCH] --- yaml --- r: 116767 b: refs/heads/master c:
 9690ad031290d86979b284bd6243313f58271bcc h: refs/heads/master i:   116765:
 9e716f0c907a12e724babfeb9addc578caf8fd18   116763:
 4d384cebaef64aaef142386e3a92488e63e90575   116759:
 9bd7cecc54fabcee759d2089983f3cab6d180a3a   116751:
 bd933ab34d957ba44ff57b76f938372b8aa1f145   116735:
 93efc13ed82cd876214fd19b3be444f5d0ec4026 v: v3

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

diff --git a/[refs] b/[refs]
index 015ee0251af3..49a7fee90710 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f14488ccfe0f41207e40520fab60dce356ed9e57
+refs/heads/master: 9690ad031290d86979b284bd6243313f58271bcc
diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
index 48e496fe1e75..a36b014ee662 100644
--- a/trunk/arch/ia64/Kconfig
+++ b/trunk/arch/ia64/Kconfig
@@ -21,6 +21,7 @@ config IA64
 	select HAVE_KRETPROBES
 	select HAVE_DMA_ATTRS
 	select HAVE_KVM
+	select HAVE_ARCH_TRACEHOOK
 	default y
 	help
 	  The Itanium Processor Family is Intel's 64-bit successor to