From afca86b05511bca6c677aa15866a3e0eb1a52f0a Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 27 Aug 2008 04:17:24 -0700
Subject: [PATCH] --- yaml --- r: 113031 b: refs/heads/master c:
 9b9644c6d91e9fd8edecba3ae57a35285cfce9db h: refs/heads/master i:   113029:
 c305f08af6552d5b18df8265a51868910f937e2b   113027:
 a61696b4197654393be6c7582c737081cab5d50f   113023:
 2925bd99e3477c0066951f1701b5273a977ca25d v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/sparc/include/asm/sbus_32.h | 18 ------------------
 trunk/arch/sparc/include/asm/sbus_64.h | 18 ------------------
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/[refs] b/[refs]
index a14d538d7074..4fc40b51f536 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 615deeb27b7c3f51b464b47e8b9a8e433ab2d0ca
+refs/heads/master: 9b9644c6d91e9fd8edecba3ae57a35285cfce9db
diff --git a/trunk/arch/sparc/include/asm/sbus_32.h b/trunk/arch/sparc/include/asm/sbus_32.h
index 9f35ae870b59..fdaf1a74492a 100644
--- a/trunk/arch/sparc/include/asm/sbus_32.h
+++ b/trunk/arch/sparc/include/asm/sbus_32.h
@@ -21,24 +21,6 @@
  * you can get a SBus 'slot' number and an offset within that slot.
  */
 
-/* The base address at which to calculate device OBIO addresses. */
-#define SUN_SBUS_BVADDR        0xf8000000
-#define SBUS_OFF_MASK          0x01ffffff
-
-/* These routines are used to calculate device address from slot
- * numbers + offsets, and vice versa.
- */
-
-static inline unsigned long sbus_devaddr(int slotnum, unsigned long offset)
-{
-  return (unsigned long) (SUN_SBUS_BVADDR+((slotnum)<<25)+(offset));
-}
-
-static inline int sbus_dev_slot(unsigned long dev_addr)
-{
-  return (int) (((dev_addr)-SUN_SBUS_BVADDR)>>25);
-}
-
 struct sbus_bus;
 
 /* Linux SBUS device tables */
diff --git a/trunk/arch/sparc/include/asm/sbus_64.h b/trunk/arch/sparc/include/asm/sbus_64.h
index ec3509a3d974..6b3b055fca71 100644
--- a/trunk/arch/sparc/include/asm/sbus_64.h
+++ b/trunk/arch/sparc/include/asm/sbus_64.h
@@ -21,24 +21,6 @@
  * you can get a SBus 'slot' number and an offset within that slot.
  */
 
-/* The base address at which to calculate device OBIO addresses. */
-#define SUN_SBUS_BVADDR        0x00000000
-#define SBUS_OFF_MASK          0x0fffffff
-
-/* These routines are used to calculate device address from slot
- * numbers + offsets, and vice versa.
- */
-
-static inline unsigned long sbus_devaddr(int slotnum, unsigned long offset)
-{
-  return (unsigned long) (SUN_SBUS_BVADDR+((slotnum)<<28)+(offset));
-}
-
-static inline int sbus_dev_slot(unsigned long dev_addr)
-{
-  return (int) (((dev_addr)-SUN_SBUS_BVADDR)>>28);
-}
-
 struct sbus_bus;
 
 /* Linux SBUS device tables */