X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-x86_64%2Fmach-xen%2Fasm%2Ffixmap.h;h=275f0d83d9d4fba3ac2a03bb4e249a8c945f77a8;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=0239abf6cbea3ca69911006cb7bdfad241c899aa;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git

diff --git a/include/asm-x86_64/mach-xen/asm/fixmap.h b/include/asm-x86_64/mach-xen/asm/fixmap.h
index 0239abf6c..275f0d83d 100644
--- a/include/asm-x86_64/mach-xen/asm/fixmap.h
+++ b/include/asm-x86_64/mach-xen/asm/fixmap.h
@@ -39,13 +39,9 @@ enum fixed_addresses {
 	VSYSCALL_FIRST_PAGE = VSYSCALL_LAST_PAGE + ((VSYSCALL_END-VSYSCALL_START) >> PAGE_SHIFT) - 1,
 	VSYSCALL_HPET,
 	FIX_HPET_BASE,
-#ifdef CONFIG_X86_LOCAL_APIC
 	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
-#endif
-#ifdef CONFIG_X86_IO_APIC
 	FIX_IO_APIC_BASE_0,
 	FIX_IO_APIC_BASE_END = FIX_IO_APIC_BASE_0 + MAX_IO_APICS-1,
-#endif
 #ifdef CONFIG_ACPI
 	FIX_ACPI_BEGIN,
 	FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1,