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/isa.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/isa.c')
| -rw-r--r-- | arch/sparc64/kernel/isa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c index 30862abee611..ae02c3820eab 100644 --- a/arch/sparc64/kernel/isa.c +++ b/arch/sparc64/kernel/isa.c | |||
| @@ -291,8 +291,8 @@ void __init isa_init(void) | |||
| 291 | isa_br->parent = pbm; | 291 | isa_br->parent = pbm; |
| 292 | isa_br->self = pdev; | 292 | isa_br->self = pdev; |
| 293 | isa_br->index = index++; | 293 | isa_br->index = index++; |
| 294 | isa_br->prom_node = pdev_cookie->prom_node; | 294 | isa_br->prom_node = pdev_cookie->prom_node->node; |
| 295 | strncpy(isa_br->prom_name, pdev_cookie->prom_name, | 295 | strncpy(isa_br->prom_name, pdev_cookie->prom_node->name, |
| 296 | sizeof(isa_br->prom_name)); | 296 | sizeof(isa_br->prom_name)); |
| 297 | 297 | ||
| 298 | prop_len = prom_getproperty(isa_br->prom_node, | 298 | prop_len = prom_getproperty(isa_br->prom_node, |