From 9c29035e4d14c61d1895eee150606261a03cb6aa Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 15 Oct 2008 22:01:07 -0700
Subject: [PATCH] --- yaml --- r: 114686 b: refs/heads/master c:
 db99100d2ed40dd9736fcb1adb3657a98f9bcfd9 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b243b3644e1e..466ea696b0bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9363b9f23c9cc36cc8ef6c05fdf879ee4a96ae92
+refs/heads/master: db99100d2ed40dd9736fcb1adb3657a98f9bcfd9
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 27b8681139fd..9eb9eb928285 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -3952,7 +3952,7 @@ static void check_for_regular_memory(pg_data_t *pgdat)
 void __init free_area_init_nodes(unsigned long *max_zone_pfn)
 {
 	unsigned long nid;
-	enum zone_type i;
+	int i;
 
 	/* Sort early_node_map as initialisation assumes it is sorted */
 	sort_node_map();