diff --git a/[refs] b/[refs]
index c4726182113a..6cb64a1e6ac4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ade81473636b33aaac64495f89a7dc572c529f0
+refs/heads/master: a217e8c18113c4f3238b01307782b99aa1547ea2
diff --git a/trunk/arch/i386/kernel/acpi/earlyquirk.c b/trunk/arch/i386/kernel/acpi/earlyquirk.c
index 087ecc67e9b3..1ae2aeeda18b 100644
--- a/trunk/arch/i386/kernel/acpi/earlyquirk.c
+++ b/trunk/arch/i386/kernel/acpi/earlyquirk.c
@@ -7,6 +7,7 @@
 #include <linux/pci.h>
 #include <asm/pci-direct.h>
 #include <asm/acpi.h>
+#include <asm/apic.h>
 
 static int __init check_bridge(int vendor, int device)
 {
@@ -15,6 +16,7 @@ static int __init check_bridge(int vendor, int device)
 	if (vendor == PCI_VENDOR_ID_NVIDIA) {
 		acpi_skip_timer_override = 1;
 	}
+#ifdef CONFIG_X86_LOCAL_APIC
 	/*
 	 * ATI IXP chipsets get double timer interrupts.
 	 * For now just do this for all ATI chipsets.
@@ -22,6 +24,7 @@ static int __init check_bridge(int vendor, int device)
 	 */
 	if (vendor == PCI_VENDOR_ID_ATI)
 		disable_timer_pin_1 = 1;
+#endif
 	return 0;
 }