diff options
Diffstat (limited to 'arch/powerpc/platforms/powermac/pci.c')
-rw-r--r-- | arch/powerpc/platforms/powermac/pci.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c index 8302e34a3cbf..fb853c0affcc 100644 --- a/arch/powerpc/platforms/powermac/pci.c +++ b/arch/powerpc/platforms/powermac/pci.c | |||
@@ -35,8 +35,6 @@ | |||
35 | #define DBG(x...) | 35 | #define DBG(x...) |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | static int add_bridge(struct device_node *dev); | ||
39 | |||
40 | /* XXX Could be per-controller, but I don't think we risk anything by | 38 | /* XXX Could be per-controller, but I don't think we risk anything by |
41 | * assuming we won't have both UniNorth and Bandit */ | 39 | * assuming we won't have both UniNorth and Bandit */ |
42 | static int has_uninorth; | 40 | static int has_uninorth; |
@@ -897,7 +895,7 @@ static void __init setup_u3_ht(struct pci_controller* hose) | |||
897 | * "pci" (a MPC106) and no bandit or chaos bridges, and contrariwise, | 895 | * "pci" (a MPC106) and no bandit or chaos bridges, and contrariwise, |
898 | * if we have one or more bandit or chaos bridges, we don't have a MPC106. | 896 | * if we have one or more bandit or chaos bridges, we don't have a MPC106. |
899 | */ | 897 | */ |
900 | static int __init add_bridge(struct device_node *dev) | 898 | static int __init pmac_add_bridge(struct device_node *dev) |
901 | { | 899 | { |
902 | int len; | 900 | int len; |
903 | struct pci_controller *hose; | 901 | struct pci_controller *hose; |
@@ -1023,7 +1021,7 @@ void __init pmac_pci_init(void) | |||
1023 | if (strcmp(np->name, "bandit") == 0 | 1021 | if (strcmp(np->name, "bandit") == 0 |
1024 | || strcmp(np->name, "chaos") == 0 | 1022 | || strcmp(np->name, "chaos") == 0 |
1025 | || strcmp(np->name, "pci") == 0) { | 1023 | || strcmp(np->name, "pci") == 0) { |
1026 | if (add_bridge(np) == 0) | 1024 | if (pmac_add_bridge(np) == 0) |
1027 | of_node_get(np); | 1025 | of_node_get(np); |
1028 | } | 1026 | } |
1029 | if (strcmp(np->name, "ht") == 0) { | 1027 | if (strcmp(np->name, "ht") == 0) { |
@@ -1037,7 +1035,7 @@ void __init pmac_pci_init(void) | |||
1037 | /* Probe HT last as it relies on the agp resources to be already | 1035 | /* Probe HT last as it relies on the agp resources to be already |
1038 | * setup | 1036 | * setup |
1039 | */ | 1037 | */ |
1040 | if (ht && add_bridge(ht) != 0) | 1038 | if (ht && pmac_add_bridge(ht) != 0) |
1041 | of_node_put(ht); | 1039 | of_node_put(ht); |
1042 | 1040 | ||
1043 | /* Setup the linkage between OF nodes and PHBs */ | 1041 | /* Setup the linkage between OF nodes and PHBs */ |