]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
sparc64: Kill isa_bus_type.
authorDavid S. Miller <davem@davemloft.net>
Wed, 30 Jul 2008 06:47:17 +0000 (23:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Jul 2008 06:47:17 +0000 (23:47 -0700)
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>
arch/sparc/include/asm/of_platform_64.h
arch/sparc64/kernel/of_device.c

index 4f66a5f6342d88dae63419b799707fbabba1c3f2..ccaa33c10752b278d358468da0c936104cf60bf7 100644 (file)
@@ -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;
 
index 4fd48ab7dda40bef2a290e08cb07558122b3be35..f8b50cbf4bf711658ef3ad742270da424cbf4294 100644 (file)
@@ -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
@@ -841,8 +838,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