diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-01-14 00:13:49 +0000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-14 13:19:18 +1100 |
| commit | 575e321606c5673efabf28c0fa075e198980c44e (patch) | |
| tree | 0d9f9c1a78946aca34af74f701dc3f7cf251e47a /arch/powerpc/platforms/chrp/setup.c | |
| parent | 91dc182ca6e25ee8b648ed2fb2a41859ead34903 (diff) | |
| download | op-kernel-dev-575e321606c5673efabf28c0fa075e198980c44e.zip op-kernel-dev-575e321606c5673efabf28c0fa075e198980c44e.tar.gz | |
[PATCH] powerpc: Make CHRP build again
This makes CHRP build again, although it's untested because my Pegasos
is currently in pieces.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/chrp/setup.c')
| -rw-r--r-- | arch/powerpc/platforms/chrp/setup.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c index 4ec8ba7..2dc87aa 100644 --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c @@ -352,9 +352,10 @@ static void __init chrp_find_openpic(void) opaddr = opprop[na-1]; /* assume 32-bit */ oplen /= na * sizeof(unsigned int); } else { - if (np->n_addrs == 0) + struct resource r; + if (of_address_to_resource(np, 0, &r)) return; - opaddr = np->addrs[0].address; + opaddr = r.start; oplen = 0; } @@ -377,7 +378,7 @@ static void __init chrp_find_openpic(void) */ if (oplen < len) { printk(KERN_ERR "Insufficient addresses for distributed" - " OpenPIC (%d < %d)\n", np->n_addrs, len); + " OpenPIC (%d < %d)\n", oplen, len); len = oplen; } |
