diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-06-22 19:18:54 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-24 02:15:26 -0400 |
commit | de8d28b16f5614aeb12bb69c8f9a38578b8d3ada (patch) | |
tree | 152f0930dc099606342e9cc6d9a3892cd9f3f192 /arch/sparc64/kernel/pci_sun4v.c | |
parent | 765b5f32730cfd2608291e679060b0391570c8b3 (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_sun4v.c')
-rw-r--r-- | arch/sparc64/kernel/pci_sun4v.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/pci_sun4v.c b/arch/sparc64/kernel/pci_sun4v.c index b275c7df0186..b69e2270a721 100644 --- a/arch/sparc64/kernel/pci_sun4v.c +++ b/arch/sparc64/kernel/pci_sun4v.c | |||
@@ -814,8 +814,7 @@ static void pbm_scan_bus(struct pci_controller_info *p, | |||
814 | pci_fixup_host_bridge_self(pbm->pci_bus); | 814 | pci_fixup_host_bridge_self(pbm->pci_bus); |
815 | pbm->pci_bus->self->sysdata = cookie; | 815 | pbm->pci_bus->self->sysdata = cookie; |
816 | #endif | 816 | #endif |
817 | pci_fill_in_pbm_cookies(pbm->pci_bus, pbm, | 817 | pci_fill_in_pbm_cookies(pbm->pci_bus, pbm, pbm->prom_node); |
818 | pbm->prom_node->node); | ||
819 | pci_record_assignments(pbm, pbm->pci_bus); | 818 | pci_record_assignments(pbm, pbm->pci_bus); |
820 | pci_assign_unassigned(pbm, pbm->pci_bus); | 819 | pci_assign_unassigned(pbm, pbm->pci_bus); |
821 | pci_fixup_irq(pbm, pbm->pci_bus); | 820 | pci_fixup_irq(pbm, pbm->pci_bus); |