From 71f42f86b96e2a37404b6fc1ac72170c6ab5928d Mon Sep 17 00:00:00 2001
From: Manish Ahuja <ahuja@austin.ibm.com>
Date: Tue, 10 Jul 2007 05:03:45 +1000
Subject: [PATCH] --- yaml --- r: 63018 b: refs/heads/master c:
 56d6d1a73d9e5ddd9eb1a7baeeda30803ba44879 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/powerpc/mm/lmb.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b29bce47a463..a217ea879d31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77926826f301fbd8ed96d3cd9ff17a5b59560dfb
+refs/heads/master: 56d6d1a73d9e5ddd9eb1a7baeeda30803ba44879
diff --git a/trunk/arch/powerpc/mm/lmb.c b/trunk/arch/powerpc/mm/lmb.c
index e3a1e8dc536a..8f4d2dc4cafb 100644
--- a/trunk/arch/powerpc/mm/lmb.c
+++ b/trunk/arch/powerpc/mm/lmb.c
@@ -138,8 +138,8 @@ void __init lmb_analyze(void)
 static long __init lmb_add_region(struct lmb_region *rgn, unsigned long base,
 				  unsigned long size)
 {
-	unsigned long i, coalesced = 0;
-	long adjacent;
+	unsigned long coalesced = 0;
+	long adjacent, i;
 
 	/* First try and coalesce this LMB with another. */
 	for (i=0; i < rgn->cnt; i++) {