Merge branch 'rmobile/sdio' into rmobile-latest

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index 0141b234406f..4729b2b63117 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/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.