Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / x86 / include / asm / fixmap.h

diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index 9479a037419fe1358a96cece0d877a269c71e365..4729b2b631170cb621ab5549c4fc7f474a27d5cc 100644 (file)
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -116,7 +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 */
+#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.