Fix fallout from ATI Xpress timer workaround

ACPI earlyquirks needs to honor the proper config variables, and include
the right header file.

(Fixes commit 66759a0)

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

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,13 +16,15 @@ 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.
  	 * FIXME: this needs to be checked for the non ACPI case too.
 	 */
 	if (vendor == PCI_VENDOR_ID_ATI)
 		disable_timer_pin_1 = 1;
+#endif
 	return 0;
 }