diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 20:17:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 20:17:08 -0800 |
| commit | d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a (patch) | |
| tree | 390aee5c110aa8314f30efa95367d7e27e6ebeb9 /arch/powerpc/kernel/prom_init.c | |
| parent | 1a57198609615a936ff57da37b6957db9bafde83 (diff) | |
| parent | ed1189b7e8cd8144f0b232c220aed4ee26d89463 (diff) | |
| download | linux-d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel/prom_init.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 4ce0105c308ea..bcdc209dca852 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -265,7 +265,7 @@ static int __init call_prom_ret(const char *service, int nargs, int nret, va_end(list); for (i = 0; i < nret; i++) - rets[nargs+i] = 0; + args.args[nargs+i] = 0; if (enter_prom(&args, RELOC(prom_entry)) < 0) return PROM_ERROR; |