mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
Fix fallout from ATI Xpress timer workaround
ACPI earlyquirks needs to honor the proper config variables, and include
the right header file.
(Fixes commit 66759a01ad
)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
2ade814736
commit
a217e8c181
1 changed files with 3 additions and 0 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue