From: Linus Torvalds Date: Mon, 12 Sep 2005 19:32:31 +0000 (-0700) Subject: Fix fallout from ATI Xpress timer workaround X-Git-Tag: v2.6.14-rc1~14 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a217e8c18113c4f3238b01307782b99aa1547ea2;p=linux-2.6-omap-h63xx.git Fix fallout from ATI Xpress timer workaround ACPI earlyquirks needs to honor the proper config variables, and include the right header file. (Fixes commit 66759a01adbfe8828dd063e32cf5ed3f46696181) Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c index 087ecc67e9b..1ae2aeeda18 100644 --- a/arch/i386/kernel/acpi/earlyquirk.c +++ b/arch/i386/kernel/acpi/earlyquirk.c @@ -7,6 +7,7 @@ #include #include #include +#include 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; }