diff --git a/[refs] b/[refs]
index a87091a9acc7..6d2fd202ccb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 046e26a8ba10b8ceff822f8d91451ab6c1e08c4e
+refs/heads/master: 47a2d7288538e7f334a0be318317b138f0e3dfbe
diff --git a/trunk/arch/sparc/include/asm/of_platform.h b/trunk/arch/sparc/include/asm/of_platform.h
index 2348ab90a57c..71ada5238b97 100644
--- a/trunk/arch/sparc/include/asm/of_platform.h
+++ b/trunk/arch/sparc/include/asm/of_platform.h
@@ -14,7 +14,6 @@
  */
 
 extern struct bus_type ebus_bus_type;
-extern struct bus_type sbus_bus_type;
 
 #define of_bus_type	of_platform_bus_type	/* for compatibility */
 
diff --git a/trunk/arch/sparc/kernel/of_device.c b/trunk/arch/sparc/kernel/of_device.c
index 8fdc1b3113b9..576fa2ffa69f 100644
--- a/trunk/arch/sparc/kernel/of_device.c
+++ b/trunk/arch/sparc/kernel/of_device.c
@@ -67,11 +67,6 @@ struct bus_type ebus_bus_type;
 EXPORT_SYMBOL(ebus_bus_type);
 #endif
 
-#ifdef CONFIG_SBUS
-struct bus_type sbus_bus_type;
-EXPORT_SYMBOL(sbus_bus_type);
-#endif
-
 struct bus_type of_platform_bus_type;
 EXPORT_SYMBOL(of_platform_bus_type);
 
@@ -593,10 +588,6 @@ static int __init of_bus_driver_init(void)
 	if (!err)
 		err = of_bus_type_init(&ebus_bus_type, "ebus");
 #endif
-#ifdef CONFIG_SBUS
-	if (!err)
-		err = of_bus_type_init(&sbus_bus_type, "sbus");
-#endif
 
 	if (!err)
 		scan_of_devices();
diff --git a/trunk/arch/sparc64/kernel/of_device.c b/trunk/arch/sparc64/kernel/of_device.c
index b22475f85a5e..6ae92536517a 100644
--- a/trunk/arch/sparc64/kernel/of_device.c
+++ b/trunk/arch/sparc64/kernel/of_device.c
@@ -93,11 +93,6 @@ struct bus_type ebus_bus_type;
 EXPORT_SYMBOL(ebus_bus_type);
 #endif
 
-#ifdef CONFIG_SBUS
-struct bus_type sbus_bus_type;
-EXPORT_SYMBOL(sbus_bus_type);
-#endif
-
 struct bus_type of_platform_bus_type;
 EXPORT_SYMBOL(of_platform_bus_type);
 
@@ -874,10 +869,6 @@ static int __init of_bus_driver_init(void)
 	if (!err)
 		err = of_bus_type_init(&ebus_bus_type, "ebus");
 #endif
-#ifdef CONFIG_SBUS
-	if (!err)
-		err = of_bus_type_init(&sbus_bus_type, "sbus");
-#endif
 
 	if (!err)
 		scan_of_devices();