aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/sparc/include/asm/of_platform.h1
-rw-r--r--arch/sparc/kernel/of_device.c9
-rw-r--r--arch/sparc64/kernel/of_device.c9
3 files changed, 0 insertions, 19 deletions
diff --git a/arch/sparc/include/asm/of_platform.h b/arch/sparc/include/asm/of_platform.h
index 2348ab90a57..71ada5238b9 100644
--- a/arch/sparc/include/asm/of_platform.h
+++ b/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/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c
index 8fdc1b3113b..576fa2ffa69 100644
--- a/arch/sparc/kernel/of_device.c
+++ b/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/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index b22475f85a5..6ae92536517 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/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();