diff --git a/[refs] b/[refs]
index 63a3226c2386..c85edcf43bb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6e5f661eee0ff62e7fdb263cfeee73c20dd6e99
+refs/heads/master: d32bcdd7a90f19bc067a272b353800108d092c5e
diff --git a/trunk/arch/sparc/include/asm/sbus_32.h b/trunk/arch/sparc/include/asm/sbus_32.h
index 99f79e4a7094..d960f3e61ec6 100644
--- a/trunk/arch/sparc/include/asm/sbus_32.h
+++ b/trunk/arch/sparc/include/asm/sbus_32.h
@@ -41,13 +41,6 @@ struct sbus_bus {
 };
 #define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev)
 
-static inline int
-sbus_is_slave(struct sbus_dev *dev)
-{
-	/* XXX Have to write this for sun4c's */
-	return 0;
-}
-
 /* These yield IOMMU mappings in consistent mode. */
 void prom_adjust_ranges(struct linux_prom_ranges *, int,
 			struct linux_prom_ranges *, int);