diff options
| -rw-r--r-- | arch/x86/include/asm/fixmap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h index 635f03bb4995..d07b44f7d1dc 100644 --- a/arch/x86/include/asm/fixmap.h +++ b/arch/x86/include/asm/fixmap.h | |||
| @@ -82,6 +82,9 @@ enum fixed_addresses { | |||
| 82 | #endif | 82 | #endif |
| 83 | FIX_DBGP_BASE, | 83 | FIX_DBGP_BASE, |
| 84 | FIX_EARLYCON_MEM_BASE, | 84 | FIX_EARLYCON_MEM_BASE, |
| 85 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | ||
| 86 | FIX_OHCI1394_BASE, | ||
| 87 | #endif | ||
| 85 | #ifdef CONFIG_X86_LOCAL_APIC | 88 | #ifdef CONFIG_X86_LOCAL_APIC |
| 86 | FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ | 89 | FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */ |
| 87 | #endif | 90 | #endif |
| @@ -132,9 +135,6 @@ enum fixed_addresses { | |||
| 132 | (__end_of_permanent_fixed_addresses & (TOTAL_FIX_BTMAPS - 1)) | 135 | (__end_of_permanent_fixed_addresses & (TOTAL_FIX_BTMAPS - 1)) |
| 133 | : __end_of_permanent_fixed_addresses, | 136 | : __end_of_permanent_fixed_addresses, |
| 134 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + TOTAL_FIX_BTMAPS - 1, | 137 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + TOTAL_FIX_BTMAPS - 1, |
| 135 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | ||
| 136 | FIX_OHCI1394_BASE, | ||
| 137 | #endif | ||
| 138 | #ifdef CONFIG_X86_32 | 138 | #ifdef CONFIG_X86_32 |
| 139 | FIX_WP_TEST, | 139 | FIX_WP_TEST, |
| 140 | #endif | 140 | #endif |
