From: Paul Mackerras Date: Mon, 10 Oct 2005 12:37:16 +0000 (+1000) Subject: powerpc: Make prom_init.c suitable for both 32-bit and 64-bit X-Git-Tag: v2.6.15-rc1~59^2~209 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b42b661745c8d78cd3483752fb22cc7420c67f74;p=linux-2.6-omap-h63xx.git powerpc: Make prom_init.c suitable for both 32-bit and 64-bit Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index e01cda1454c..75b487f107c 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -1968,9 +1968,9 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4, extern char _stext[]; unsigned long hdr; u32 getprop_rval; + unsigned long offset = reloc_offset(); #ifdef CONFIG_PPC32 - unsigned long offset = reloc_offset(); reloc_got2(offset); #endif