Fix fallout from ATI Xpress timer workaround

[linux-2.6-omap-h63xx.git] / arch / i386 / kernel / acpi / earlyquirk.c

diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c
index 087ecc67e9b358e265e79ee450995e1ed73b6c46..1ae2aeeda18bddbbc23ec37702d2ed4878ee23d0 100644 (file)
--- a/arch/i386/kernel/acpi/earlyquirk.c
+++ b/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;
 }