aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-27 22:45:20 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-29 05:15:22 -0400
commit47a2d7288538e7f334a0be318317b138f0e3dfbe (patch)
tree81541129d0916dc521f4bbce39fd240ce879b3c5
parent046e26a8ba10b8ceff822f8d91451ab6c1e08c4e (diff)
sparc: Kill sbus_bus_type.
No longer used. Signed-off-by: David S. Miller <davem@davemloft.net>
-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 2348ab90a57c..71ada5238b97 100644
--- a/arch/sparc/include/asm/of_platform.h
+++ b/arch/sparc/include/asm/of_platform.h
@@ -14,7 +14,6 @@
14 */ 14 */
15 15
16extern struct bus_type ebus_bus_type; 16extern struct bus_type ebus_bus_type;
17extern struct bus_type sbus_bus_type;
18 17
19#define of_bus_type of_platform_bus_type /* for compatibility */ 18#define of_bus_type of_platform_bus_type /* for compatibility */
20 19
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c
index 8fdc1b3113b9..576fa2ffa69f 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;
67EXPORT_SYMBOL(ebus_bus_type); 67EXPORT_SYMBOL(ebus_bus_type);
68#endif 68#endif
69 69
70#ifdef CONFIG_SBUS
71struct bus_type sbus_bus_type;
72EXPORT_SYMBOL(sbus_bus_type);
73#endif
74
75struct bus_type of_platform_bus_type; 70struct bus_type of_platform_bus_type;
76EXPORT_SYMBOL(of_platform_bus_type); 71EXPORT_SYMBOL(of_platform_bus_type);
77 72
@@ -593,10 +588,6 @@ static int __init of_bus_driver_init(void)
593 if (!err) 588 if (!err)
594 err = of_bus_type_init(&ebus_bus_type, "ebus"); 589 err = of_bus_type_init(&ebus_bus_type, "ebus");
595#endif 590#endif
596#ifdef CONFIG_SBUS
597 if (!err)
598 err = of_bus_type_init(&sbus_bus_type, "sbus");
599#endif
600 591
601 if (!err) 592 if (!err)
602 scan_of_devices(); 593 scan_of_devices();
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index b22475f85a5e..6ae92536517a 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;
93EXPORT_SYMBOL(ebus_bus_type); 93EXPORT_SYMBOL(ebus_bus_type);
94#endif 94#endif
95 95
96#ifdef CONFIG_SBUS
97struct bus_type sbus_bus_type;
98EXPORT_SYMBOL(sbus_bus_type);
99#endif
100
101struct bus_type of_platform_bus_type; 96struct bus_type of_platform_bus_type;
102EXPORT_SYMBOL(of_platform_bus_type); 97EXPORT_SYMBOL(of_platform_bus_type);
103 98
@@ -874,10 +869,6 @@ static int __init of_bus_driver_init(void)
874 if (!err) 869 if (!err)
875 err = of_bus_type_init(&ebus_bus_type, "ebus"); 870 err = of_bus_type_init(&ebus_bus_type, "ebus");
876#endif 871#endif
877#ifdef CONFIG_SBUS
878 if (!err)
879 err = of_bus_type_init(&sbus_bus_type, "sbus");
880#endif
881 872
882 if (!err) 873 if (!err)
883 scan_of_devices(); 874 scan_of_devices();