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/ebus.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/ebus.c')
-rw-r--r-- | arch/sparc64/kernel/ebus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c index c69504aa638f..3125a5b49775 100644 --- a/arch/sparc64/kernel/ebus.c +++ b/arch/sparc64/kernel/ebus.c | |||
@@ -553,7 +553,7 @@ void __init ebus_init(void) | |||
553 | } | 553 | } |
554 | 554 | ||
555 | cookie = pdev->sysdata; | 555 | cookie = pdev->sysdata; |
556 | ebusnd = cookie->prom_node; | 556 | ebusnd = cookie->prom_node->node; |
557 | 557 | ||
558 | ebus_chain = ebus = ebus_alloc(sizeof(struct linux_ebus)); | 558 | ebus_chain = ebus = ebus_alloc(sizeof(struct linux_ebus)); |
559 | ebus->next = NULL; | 559 | ebus->next = NULL; |
@@ -578,7 +578,7 @@ void __init ebus_init(void) | |||
578 | } | 578 | } |
579 | ebus->is_rio = is_rio; | 579 | ebus->is_rio = is_rio; |
580 | cookie = pdev->sysdata; | 580 | cookie = pdev->sysdata; |
581 | ebusnd = cookie->prom_node; | 581 | ebusnd = cookie->prom_node->node; |
582 | continue; | 582 | continue; |
583 | } | 583 | } |
584 | printk("ebus%d:", num_ebus); | 584 | printk("ebus%d:", num_ebus); |
@@ -622,7 +622,7 @@ void __init ebus_init(void) | |||
622 | break; | 622 | break; |
623 | 623 | ||
624 | cookie = pdev->sysdata; | 624 | cookie = pdev->sysdata; |
625 | ebusnd = cookie->prom_node; | 625 | ebusnd = cookie->prom_node->node; |
626 | 626 | ||
627 | ebus->next = ebus_alloc(sizeof(struct linux_ebus)); | 627 | ebus->next = ebus_alloc(sizeof(struct linux_ebus)); |
628 | ebus = ebus->next; | 628 | ebus = ebus->next; |