diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:34:07 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-30 11:34:07 +1100 |
| commit | 051bc26320414918b69a4513614c3987f3e29bc6 (patch) | |
| tree | 5de5d4d62e305da4e44a65f5b4602c7165e2f92f /arch/x86/include/asm/fixmap.h | |
| parent | cdcecfd45dfcaf35b11b9870ba75615992d2288f (diff) | |
| parent | 753999f751ab57630f368a73a465cb8a7b5b99b6 (diff) | |
Merge remote branch 'tip/auto-latest'
Diffstat (limited to 'arch/x86/include/asm/fixmap.h')
| -rw-r--r-- | arch/x86/include/asm/fixmap.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index 9479a037419f..0141b234406f 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h @@ -117,6 +117,10 @@ enum fixed_addresses { 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 /* * 256 temporary boot-time mappings, used by early_ioremap(), * before ioremap() is functional. |