aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/sparc/include/asm/of_platform.h2
-rw-r--r--arch/sparc/kernel/of_device.c10
-rw-r--r--arch/sparc64/kernel/of_device.c10
3 files changed, 0 insertions, 22 deletions
diff --git a/arch/sparc/include/asm/of_platform.h b/arch/sparc/include/asm/of_platform.h
index 71ada5238b97..90da99059f83 100644
--- a/arch/sparc/include/asm/of_platform.h
+++ b/arch/sparc/include/asm/of_platform.h
@@ -13,8 +13,6 @@
13 * 13 *
14 */ 14 */
15 15
16extern struct bus_type ebus_bus_type;
17
18#define of_bus_type of_platform_bus_type /* for compatibility */ 16#define of_bus_type of_platform_bus_type /* for compatibility */
19 17
20#endif 18#endif
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c
index 576fa2ffa69f..c59014886afe 100644
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@ -62,11 +62,6 @@ void of_propagate_archdata(struct of_device *bus)
62 } 62 }
63} 63}
64 64
65#ifdef CONFIG_PCI
66struct bus_type ebus_bus_type;
67EXPORT_SYMBOL(ebus_bus_type);
68#endif
69
70struct bus_type of_platform_bus_type; 65struct bus_type of_platform_bus_type;
71EXPORT_SYMBOL(of_platform_bus_type); 66EXPORT_SYMBOL(of_platform_bus_type);
72 67
@@ -584,11 +579,6 @@ static int __init of_bus_driver_init(void)
584 int err; 579 int err;
585 580
586 err = of_bus_type_init(&of_platform_bus_type, "of"); 581 err = of_bus_type_init(&of_platform_bus_type, "of");
587#ifdef CONFIG_PCI
588 if (!err)
589 err = of_bus_type_init(&ebus_bus_type, "ebus");
590#endif
591
592 if (!err) 582 if (!err)
593 scan_of_devices(); 583 scan_of_devices();
594 584
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index 6ae92536517a..e427086e3b58 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -88,11 +88,6 @@ void of_propagate_archdata(struct of_device *bus)
88 } 88 }
89} 89}
90 90
91#ifdef CONFIG_PCI
92struct bus_type ebus_bus_type;
93EXPORT_SYMBOL(ebus_bus_type);
94#endif
95
96struct bus_type of_platform_bus_type; 91struct bus_type of_platform_bus_type;
97EXPORT_SYMBOL(of_platform_bus_type); 92EXPORT_SYMBOL(of_platform_bus_type);
98 93
@@ -865,11 +860,6 @@ static int __init of_bus_driver_init(void)
865 int err; 860 int err;
866 861
867 err = of_bus_type_init(&of_platform_bus_type, "of"); 862 err = of_bus_type_init(&of_platform_bus_type, "of");
868#ifdef CONFIG_PCI
869 if (!err)
870 err = of_bus_type_init(&ebus_bus_type, "ebus");
871#endif
872
873 if (!err) 863 if (!err)
874 scan_of_devices(); 864 scan_of_devices();
875 865