diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-30 02:47:17 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-30 02:47:17 -0400 |
commit | 71fc324b5beded4d55dc67fd39aab8b78c6898cb (patch) | |
tree | d34c81c1b889a2621c95753a7b56ebdcf0b40481 | |
parent | 17b6f586b8e27914b36c9ed7f3e4d289e6274a80 (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.h | 1 | ||||
-rw-r--r-- | arch/sparc64/kernel/of_device.c | 5 |
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 4f66a5f6342d..ccaa33c10752 100644 --- a/arch/sparc/include/asm/of_platform_64.h +++ b/arch/sparc/include/asm/of_platform_64.h | |||
@@ -16,7 +16,6 @@ | |||
16 | /* This is just here during the transition */ | 16 | /* This is just here during the transition */ |
17 | #include <linux/of_platform.h> | 17 | #include <linux/of_platform.h> |
18 | 18 | ||
19 | extern struct bus_type isa_bus_type; | ||
20 | extern struct bus_type ebus_bus_type; | 19 | extern struct bus_type ebus_bus_type; |
21 | extern struct bus_type sbus_bus_type; | 20 | extern struct bus_type sbus_bus_type; |
22 | 21 | ||
diff --git a/arch/sparc64/kernel/of_device.c b/arch/sparc64/kernel/of_device.c index 4fd48ab7dda4..f8b50cbf4bf7 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) | |||
56 | EXPORT_SYMBOL(of_find_device_by_node); | 56 | EXPORT_SYMBOL(of_find_device_by_node); |
57 | 57 | ||
58 | #ifdef CONFIG_PCI | 58 | #ifdef CONFIG_PCI |
59 | struct bus_type isa_bus_type; | ||
60 | EXPORT_SYMBOL(isa_bus_type); | ||
61 | |||
62 | struct bus_type ebus_bus_type; | 59 | struct bus_type ebus_bus_type; |
63 | EXPORT_SYMBOL(ebus_bus_type); | 60 | EXPORT_SYMBOL(ebus_bus_type); |
64 | #endif | 61 | #endif |
@@ -842,8 +839,6 @@ static int __init of_bus_driver_init(void) | |||
842 | err = of_bus_type_init(&of_platform_bus_type, "of"); | 839 | err = of_bus_type_init(&of_platform_bus_type, "of"); |
843 | #ifdef CONFIG_PCI | 840 | #ifdef CONFIG_PCI |
844 | if (!err) | 841 | if (!err) |
845 | err = of_bus_type_init(&isa_bus_type, "isa"); | ||
846 | if (!err) | ||
847 | err = of_bus_type_init(&ebus_bus_type, "ebus"); | 842 | err = of_bus_type_init(&ebus_bus_type, "ebus"); |
848 | #endif | 843 | #endif |
849 | #ifdef CONFIG_SBUS | 844 | #ifdef CONFIG_SBUS |