Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd

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

diff --git a/include/asm-x86/fixmap_64.h b/include/asm-x86/fixmap_64.h
index 6a4789d57e6cfa95e638117f3c4addbbd10729c8..00f3d74a0524d71e77bfb4730a8b6c13f38b052f 100644 (file)
--- a/include/asm-x86/fixmap_64.h
+++ b/include/asm-x86/fixmap_64.h
@@ -40,7 +40,6 @@ enum fixed_addresses {
        VSYSCALL_HPET,
        FIX_DBGP_BASE,
        FIX_EARLYCON_MEM_BASE,
-       FIX_HPET_BASE,
        FIX_APIC_BASE,  /* local (CPU) APIC) -- required for SMP or not */
        FIX_IO_APIC_BASE_0,
        FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS - 1,