--- arch/x86/include/asm/fixmap.h

+++ arch/x86/include/asm/fixmap.h

@@ -82,6 +82,9 @@ enum fixed_addresses {

#endif

FIX_DBGP_BASE,

FIX_EARLYCON_MEM_BASE,

+#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT

+ FIX_OHCI1394_BASE,

+#endif

#ifdef CONFIG_X86_LOCAL_APIC

FIX_APIC_BASE, /* local (CPU) APIC) -- required for SMP or not */

#endif

@@ -126,9 +129,6 @@ enum fixed_addresses {

FIX_BTMAP_END = __end_of_permanent_fixed_addresses + 256 -

(__end_of_permanent_fixed_addresses & 255),

FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1,

-#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT

- FIX_OHCI1394_BASE,

-#endif

#ifdef CONFIG_X86_32

FIX_WP_TEST,

#endif