diff options
| author | David S. Miller | 2006-06-23 01:18:54 +0200 |
|---|---|---|
| committer | David S. Miller | 2006-06-24 08:15:26 +0200 |
| commit | de8d28b16f5614aeb12bb69c8f9a38578b8d3ada (patch) | |
| tree | 152f0930dc099606342e9cc6d9a3892cd9f3f192 /arch/sparc64/kernel/isa.c | |
| parent | [SPARC64]: Must run smp_setup_cpu_possible_map() after paging_init() (diff) | |
| download | kernel-qcow2-linux-de8d28b16f5614aeb12bb69c8f9a38578b8d3ada.tar.gz kernel-qcow2-linux-de8d28b16f5614aeb12bb69c8f9a38578b8d3ada.tar.xz kernel-qcow2-linux-de8d28b16f5614aeb12bb69c8f9a38578b8d3ada.zip | |
[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) isa_br->parent = pbm; isa_br->self = pdev; isa_br->index = index++; - isa_br->prom_node = pdev_cookie->prom_node; - strncpy(isa_br->prom_name, pdev_cookie->prom_name, + isa_br->prom_node = pdev_cookie->prom_node->node; + strncpy(isa_br->prom_name, pdev_cookie->prom_node->name, sizeof(isa_br->prom_name)); prop_len = prom_getproperty(isa_br->prom_node, |