[POWERPC] of_platform_make_bus_id(): make `magic' int
authorGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Thu, 7 Dec 2006 15:49:18 +0000 (16:49 +0100)
committerPaul Mackerras <paulus@samba.org>
Fri, 8 Dec 2006 06:10:22 +0000 (17:10 +1100)
of_platform_make_bus_id(): Kill a compiler warning which is a real
bug on PPC64 by changing `magic' to `int'.

Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/of_platform.c

index b3189d0161b8d7b4f9a60ac0db8c1804a55584a9..3002ea3a61a24df59fd437ecbd80866af1e3c6d6 100644 (file)
@@ -169,7 +169,7 @@ static void of_platform_make_bus_id(struct of_device *dev)
        char *name = dev->dev.bus_id;
        const u32 *reg;
        u64 addr;
-       long magic;
+       int magic;
 
        /*
         * If it's a DCR based device, use 'd' for native DCRs