aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-29 23:47:17 -0700
committerDavid S. Miller <davem@davemloft.net>2008-07-29 23:47:17 -0700
commit71fc324b5beded4d55dc67fd39aab8b78c6898cb (patch)
treed34c81c1b889a2621c95753a7b56ebdcf0b40481
parent17b6f586b8e27914b36c9ed7f3e4d289e6274a80 (diff)
sparc64: Kill isa_bus_type.
I forgot to delete this when I removed the ISA bus layer from the sparc ports. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/include/asm/of_platform_64.h1
-rw-r--r--arch/sparc64/kernel/of_device.c5
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/sparc/include/asm/of_platform_64.h b/arch/sparc/include/asm/of_platform_64.h
index 4f66a5f6342..ccaa33c1075 100644
--- a/arch/sparc/include/asm/of_platform_64.h
+++ b/arch/sparc/include/asm/of_platform_64.h
@@ -16,7 +16,6 @@
/* This is just here during the transition */
#include <linux/of_platform.h>
-extern struct bus_type isa_bus_type;
extern struct bus_type ebus_bus_type;
extern struct bus_type sbus_bus_type;
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c
index 4fd48ab7dda..f8b50cbf4bf 100644
--- a/arch/sparc64/kernel/of_device.c
+++ b/arch/sparc64/kernel/of_device.c
@@ -56,9 +56,6 @@ struct of_device *of_find_device_by_node(struct device_node *dp)
EXPORT_SYMBOL(of_find_device_by_node);
#ifdef CONFIG_PCI
-struct bus_type isa_bus_type;
-EXPORT_SYMBOL(isa_bus_type);
-
struct bus_type ebus_bus_type;
EXPORT_SYMBOL(ebus_bus_type);
#endif
@@ -842,8 +839,6 @@ static int __init of_bus_driver_init(void)
err = of_bus_type_init(&of_platform_bus_type, "of");
#ifdef CONFIG_PCI
if (!err)
- err = of_bus_type_init(&isa_bus_type, "isa");
- if (!err)
err = of_bus_type_init(&ebus_bus_type, "ebus");
#endif
#ifdef CONFIG_SBUS