---

yaml --- r: 113037 b: refs/heads/master c: 47a2d72 h: refs/heads/master i: 113035: ef1436b v: v3
git-mirror · Aug 29, 2008 · a86ef0d · a86ef0d
1 parent 95143ec
commit a86ef0d
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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();
-Original file line number
+Diff line change
@@ Expand Up / @@ -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 */
@@ Expand Down @@