From 7335fa79921633dfc90bfe1d30d7da212658a35f Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Thu, 7 Dec 2006 16:49:18 +0100 Subject: [PATCH] --- yaml --- r: 44225 b: refs/heads/master c: 30d368430e71bbeaa52ae978b10b6f5f6267d912 h: refs/heads/master i: 44223: aaa64389ce7a5fca672c961e9892ad426d639715 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/of_platform.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 89dea5fc75c8..0a9235d7ab11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e254c45fb0385b411ad93960f3838de80895210 +refs/heads/master: 30d368430e71bbeaa52ae978b10b6f5f6267d912 diff --git a/trunk/arch/powerpc/kernel/of_platform.c b/trunk/arch/powerpc/kernel/of_platform.c index b3189d0161b8..3002ea3a61a2 100644 --- a/trunk/arch/powerpc/kernel/of_platform.c +++ b/trunk/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