From 686c54c290abc4b0f65f634f042965a71b679381 Mon Sep 17 00:00:00 2001
From: Huang Weiyi <hwy@cn.fujitsu.com>
Date: Tue, 29 Apr 2008 03:19:38 -0700
Subject: [PATCH] --- yaml --- r: 95407 b: refs/heads/master c:
 8cd0ae3acc0154f3f9dfa1b4a2b7c02c271533f6 h: refs/heads/master i:   95405:
 9f2eee562dc536c64491f3c623cd900d249c7da6   95403:
 bff13a76fae5733b884e6b4a63e5395a2b1b685a   95399:
 fbb7edee2dab96bcc0235859082d9b29a27be53c   95391:
 8b247b5051f3d48084be3f7f6ea02483e643bebe v: v3

---
 [refs]                          | 2 +-
 trunk/arch/sparc64/kernel/smp.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 38a3c760cacd..a992c1c11f12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2fdd7fd99dd68b77caaf2a2272b75b5da890de7
+refs/heads/master: 8cd0ae3acc0154f3f9dfa1b4a2b7c02c271533f6
diff --git a/trunk/arch/sparc64/kernel/smp.c b/trunk/arch/sparc64/kernel/smp.c
index 8face0c49fef..3aba47624df4 100644
--- a/trunk/arch/sparc64/kernel/smp.c
+++ b/trunk/arch/sparc64/kernel/smp.c
@@ -38,7 +38,6 @@
 #include <asm/pgtable.h>
 #include <asm/oplib.h>
 #include <asm/uaccess.h>
-#include <asm/timer.h>
 #include <asm/starfire.h>
 #include <asm/tlb.h>
 #include <asm/sections.h>