aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/pci_sabre.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-06-22 19:18:54 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-24 02:15:26 -0400
commitde8d28b16f5614aeb12bb69c8f9a38578b8d3ada (patch)
tree152f0930dc099606342e9cc6d9a3892cd9f3f192 /arch/sparc64/kernel/pci_sabre.c
parent765b5f32730cfd2608291e679060b0391570c8b3 (diff)
[SPARC64]: Convert sparc64 PCI layer to in-kernel device tree.
One thing this change pointed out was that we really should pull the "get 'local-mac-address' property" logic into a helper function all the network drivers can call. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/pci_sabre.c')
-rw-r--r--arch/sparc64/kernel/pci_sabre.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index 4ce7b4620c09..26f194ce4400 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -1161,7 +1161,7 @@ static void sabre_scan_bus(struct pci_controller_info *p)
1161 1161
1162 pbus->sysdata = pbm; 1162 pbus->sysdata = pbm;
1163 pbm->pci_bus = pbus; 1163 pbm->pci_bus = pbus;
1164 pci_fill_in_pbm_cookies(pbus, pbm, pbm->prom_node->node); 1164 pci_fill_in_pbm_cookies(pbus, pbm, pbm->prom_node);
1165 pci_record_assignments(pbm, pbus); 1165 pci_record_assignments(pbm, pbus);
1166 pci_assign_unassigned(pbm, pbus); 1166 pci_assign_unassigned(pbm, pbus);
1167 pci_fixup_irq(pbm, pbus); 1167 pci_fixup_irq(pbm, pbus);
@@ -1174,7 +1174,7 @@ static void sabre_scan_bus(struct pci_controller_info *p)
1174 pbm = &p->pbm_A; 1174 pbm = &p->pbm_A;
1175 sabre_bus->sysdata = pbm; 1175 sabre_bus->sysdata = pbm;
1176 pbm->pci_bus = sabre_bus; 1176 pbm->pci_bus = sabre_bus;
1177 pci_fill_in_pbm_cookies(sabre_bus, pbm, pbm->prom_node->node); 1177 pci_fill_in_pbm_cookies(sabre_bus, pbm, pbm->prom_node);
1178 pci_record_assignments(pbm, sabre_bus); 1178 pci_record_assignments(pbm, sabre_bus);
1179 pci_assign_unassigned(pbm, sabre_bus); 1179 pci_assign_unassigned(pbm, sabre_bus);
1180 pci_fixup_irq(pbm, sabre_bus); 1180 pci_fixup_irq(pbm, sabre_bus);