---

yaml --- r: 113031 b: refs/heads/master c: 9b9644c h: refs/heads/master i: 113029: c305f08 113027: a61696b 113023: 2925bd9 v: v3
git-mirror · Aug 29, 2008 · afca86b · afca86b
1 parent b405b71
commit afca86b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 37 deletions.
diff --git 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
@@ -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
@@ -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 */