From 7b683bc08f328afbbbdfd0c538494fd581ddedb0 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@linux.intel.com>
Date: Tue, 11 Jan 2011 10:55:56 +0000
Subject: [PATCH] --- yaml --- r: 228978 b: refs/heads/master c:
 fa36e956c5027d9a985d555d104d293c0a98d2c3 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/include/asm/fixmap.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 75ae4c1b7a32..cceb10be13c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 718c45bd1aa80c4e23a0ee204c973e3014e94708
+refs/heads/master: fa36e956c5027d9a985d555d104d293c0a98d2c3
diff --git a/trunk/arch/x86/include/asm/fixmap.h b/trunk/arch/x86/include/asm/fixmap.h
index 0141b234406f..4729b2b63117 100644
--- a/trunk/arch/x86/include/asm/fixmap.h
+++ b/trunk/arch/x86/include/asm/fixmap.h
@@ -116,11 +116,11 @@ enum fixed_addresses {
 #endif
 	FIX_TEXT_POKE1,	/* reserve 2 pages for text_poke() */
 	FIX_TEXT_POKE0, /* first page is last, because allocation is backward */
-	__end_of_permanent_fixed_addresses,
-
 #ifdef	CONFIG_X86_MRST
 	FIX_LNW_VRTC,
 #endif
+	__end_of_permanent_fixed_addresses,
+
 	/*
 	 * 256 temporary boot-time mappings, used by early_ioremap(),
 	 * before ioremap() is functional.