From 64b3fb833093a965b233466944c94ca4a09c6061 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 11 Sep 2008 23:53:41 -0700
Subject: [PATCH] --- yaml --- r: 113132 b: refs/heads/master c:
 21cd8833933ef20a0bbb368ea00876cbfc06141b h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/sparc64/kernel/of_device.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 00b53a1ad049..20e767b77e6a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c91e2ecad0a392604ece6e53d38b484918060825
+refs/heads/master: 21cd8833933ef20a0bbb368ea00876cbfc06141b
diff --git a/trunk/arch/sparc64/kernel/of_device.c b/trunk/arch/sparc64/kernel/of_device.c
index 5c4fbc23aeea..ef05d14bd7f1 100644
--- a/trunk/arch/sparc64/kernel/of_device.c
+++ b/trunk/arch/sparc64/kernel/of_device.c
@@ -401,8 +401,7 @@ static int __init build_one_resource(struct device_node *parent,
 				     int na, int ns, int pna)
 {
 	const u32 *ranges;
-	unsigned int rlen;
-	int rone;
+	int rone, rlen;
 
 	ranges = of_get_property(parent, "ranges", &rlen);
 	if (ranges == NULL || rlen == 0) {