From 6409e96fec397de5d59369ae17f9473de26d92c8 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 29 Jun 2006 15:22:22 -0700
Subject: [PATCH] --- yaml --- r: 31315 b: refs/heads/master c:
 f2ad06a20133125e5b6ab6497c6d90e63ded4761 h: refs/heads/master i:   31313:
 b1f398d8b78a23a4fc2de94d5a6221d49f58324a   31311:
 445a2453fa148660679a8f299e8f9451dc5d6e30 v: v3

---
 [refs]                            | 2 +-
 trunk/arch/sparc64/kernel/auxio.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 55626f4792c8..6757445d3d3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89d1d0ab4d99e1e0fe193352e1dd857787a0bfc0
+refs/heads/master: f2ad06a20133125e5b6ab6497c6d90e63ded4761
diff --git a/trunk/arch/sparc64/kernel/auxio.c b/trunk/arch/sparc64/kernel/auxio.c
index 287d066f7d01..718350aba1ec 100644
--- a/trunk/arch/sparc64/kernel/auxio.c
+++ b/trunk/arch/sparc64/kernel/auxio.c
@@ -11,10 +11,9 @@
 #include <linux/init.h>
 #include <linux/ioport.h>
 
-#include <asm/oplib.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
 #include <asm/io.h>
-#include <asm/sbus.h>
-#include <asm/ebus.h>
 #include <asm/auxio.h>
 
 void __iomem *auxio_register = NULL;