Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+3
+3
arch/i386/kernel/acpi/earlyquirk.c
+3
arch/i386/kernel/acpi/earlyquirk.c
···
7
7
#include <linux/pci.h>
8
8
#include <asm/pci-direct.h>
9
9
#include <asm/acpi.h>
10
+
#include <asm/apic.h>
10
11
11
12
static int __init check_bridge(int vendor, int device)
12
13
{
···
16
15
if (vendor == PCI_VENDOR_ID_NVIDIA) {
17
16
acpi_skip_timer_override = 1;
18
17
}
18
+
#ifdef CONFIG_X86_LOCAL_APIC
19
19
/*
20
20
* ATI IXP chipsets get double timer interrupts.
21
21
* For now just do this for all ATI chipsets.
···
24
22
*/
25
23
if (vendor == PCI_VENDOR_ID_ATI)
26
24
disable_timer_pin_1 = 1;
25
+
#endif
27
26
return 0;
28
27
}
29
28