From 9a62f6620b7dd090e42286a13c9476de397a69bf Mon Sep 17 00:00:00 2001
From: Mike Travis <travis@sgi.com>
Date: Thu, 30 Oct 2008 11:33:19 -0700
Subject: [PATCH] --- yaml --- r: 118204 b: refs/heads/master c:
 c08b6acc9b996ba6231105cb12a4125c957e0c97 h: refs/heads/master v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/x86/include/asm/uv/uv_hub.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 148cc9956e0f..9474b66d5dbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab00fee30cddf975200b3c97aef25bea144a0d89
+refs/heads/master: c08b6acc9b996ba6231105cb12a4125c957e0c97
diff --git a/trunk/arch/x86/include/asm/uv/uv_hub.h b/trunk/arch/x86/include/asm/uv/uv_hub.h
index c6ad93e315c8..7a5782610b2b 100644
--- a/trunk/arch/x86/include/asm/uv/uv_hub.h
+++ b/trunk/arch/x86/include/asm/uv/uv_hub.h
@@ -13,6 +13,7 @@
 
 #include <linux/numa.h>
 #include <linux/percpu.h>
+#include <linux/timer.h>
 #include <asm/types.h>
 #include <asm/percpu.h>