diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 23:44:02 +0300 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-05 23:44:02 +0300 |
| commit | 8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0 (patch) | |
| tree | 41758e4da78f94a20813554ef9f5ed9b323a4f8c /arch/ppc/boot/of1275 | |
| parent | cd8200e6d4f9f05e6ea48f7c000be890337396ac (diff) | |
| parent | 70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab (diff) | |
| download | linux-8cedcfd43a0b00741fff43d6a4c1a8b7748db3b0.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'arch/ppc/boot/of1275')
| -rw-r--r-- | arch/ppc/boot/of1275/claim.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ppc/boot/of1275/claim.c b/arch/ppc/boot/of1275/claim.c index e060292ae2a7..13169a5c4339 100644 --- a/arch/ppc/boot/of1275/claim.c +++ b/arch/ppc/boot/of1275/claim.c @@ -29,6 +29,7 @@ claim(unsigned int virt, unsigned int size, unsigned int align) args.virt = virt; args.size = size; args.align = align; + args.ret = (void *) 0; (*of_prom_entry)(&args); return args.ret; } |