summaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 12:32:31 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 12:32:31 -0700
commita217e8c18113c4f3238b01307782b99aa1547ea2 (patch)
tree8b81079c334d98369c34a5effa6b1cfeae8ed936 /arch/i386
parent2ade81473636b33aaac64495f89a7dc572c529f0 (diff)
downloadop-kernel-dev-a217e8c18113c4f3238b01307782b99aa1547ea2.zip
op-kernel-dev-a217e8c18113c4f3238b01307782b99aa1547ea2.tar.gz
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 <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/acpi/earlyquirk.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c
index 087ecc6..1ae2aee 100644
--- 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;
}
OpenPOWER on IntegriCloud