diff options
author | Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> | 2006-12-07 10:49:18 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-12-08 01:10:22 -0500 |
commit | 30d368430e71bbeaa52ae978b10b6f5f6267d912 (patch) | |
tree | 3cea9edfdc47edde66d4e018c34ff3f870008aba /arch/powerpc | |
parent | 9e254c45fb0385b411ad93960f3838de80895210 (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')
-rw-r--r-- | arch/powerpc/kernel/of_platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index b3189d0161b8..3002ea3a61a2 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) | |||
169 | char *name = dev->dev.bus_id; | 169 | char *name = dev->dev.bus_id; |
170 | const u32 *reg; | 170 | const u32 *reg; |
171 | u64 addr; | 171 | u64 addr; |
172 | long magic; | 172 | int magic; |
173 | 173 | ||
174 | /* | 174 | /* |
175 | * If it's a DCR based device, use 'd' for native DCRs | 175 | * If it's a DCR based device, use 'd' for native DCRs |