aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/of_platform.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>2006-12-07 16:49:18 +0100
committerPaul Mackerras <paulus@samba.org>2006-12-08 17:10:22 +1100
commit30d368430e71bbeaa52ae978b10b6f5f6267d912 (patch)
tree3cea9edfdc47edde66d4e018c34ff3f870008aba /arch/powerpc/kernel/of_platform.c
parent9e254c45fb0385b411ad93960f3838de80895210 (diff)
[POWERPC] of_platform_make_bus_id(): make `magic' int
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>
Diffstat (limited to 'arch/powerpc/kernel/of_platform.c')
-rw-r--r--arch/powerpc/kernel/of_platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index b3189d0161b..3002ea3a61a 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -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