From bdb668bd42eaadbeae076b07e64745e3e2c739c7 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 29 Jun 2006 15:28:05 -0700
Subject: [PATCH] --- yaml --- r: 31317 b: refs/heads/master c:
 ff0d2fc6a60624df46055f47ea7261c8198c7862 h: refs/heads/master i:   31315:
 6409e96fec397de5d59369ae17f9473de26d92c8 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc64/kernel/time.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index fe8f243336dd..e3844e375a6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abbce6e2fd156cbcab2fc1247c7dec8a0c68e7e3
+refs/heads/master: ff0d2fc6a60624df46055f47ea7261c8198c7862
diff --git a/trunk/arch/sparc64/kernel/time.c b/trunk/arch/sparc64/kernel/time.c
index e3132b467681..5f3dd4d800cd 100644
--- a/trunk/arch/sparc64/kernel/time.c
+++ b/trunk/arch/sparc64/kernel/time.c
@@ -38,11 +38,8 @@
 #include <asm/timer.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <asm/sbus.h>
-#include <asm/fhc.h>
-#include <asm/pbm.h>
-#include <asm/ebus.h>
-#include <asm/isa.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
 #include <asm/starfire.h>
 #include <asm/smp.h>
 #include <asm/sections.h>