From 2719f04d9123bf5856b074c5ffef740bc53c4452 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 29 Jul 2008 23:47:17 -0700 Subject: [PATCH] --- yaml --- r: 107499 b: refs/heads/master c: 71fc324b5beded4d55dc67fd39aab8b78c6898cb h: refs/heads/master i: 107497: f432494530b412add5a963de7593adb38262d0d5 107495: 46633f624a63b87b701a25e9b28b376d9a9c4d48 v: v3 --- [refs] | 2 +- trunk/arch/sparc/include/asm/of_platform_64.h | 1 - trunk/arch/sparc64/kernel/of_device.c | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index af164abef937..31dda4b5da26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17b6f586b8e27914b36c9ed7f3e4d289e6274a80 +refs/heads/master: 71fc324b5beded4d55dc67fd39aab8b78c6898cb diff --git a/trunk/arch/sparc/include/asm/of_platform_64.h b/trunk/arch/sparc/include/asm/of_platform_64.h index 4f66a5f6342d..ccaa33c10752 100644 --- a/trunk/arch/sparc/include/asm/of_platform_64.h +++ b/trunk/arch/sparc/include/asm/of_platform_64.h @@ -16,7 +16,6 @@ /* This is just here during the transition */ #include -extern struct bus_type isa_bus_type; extern struct bus_type ebus_bus_type; extern struct bus_type sbus_bus_type; diff --git a/trunk/arch/sparc64/kernel/of_device.c b/trunk/arch/sparc64/kernel/of_device.c index 4fd48ab7dda4..f8b50cbf4bf7 100644 --- a/trunk/arch/sparc64/kernel/of_device.c +++ b/trunk/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 @@ -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