diff options
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/acpi/earlyquirk.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c index 087ecc67e9b3..1ae2aeeda18b 100644 --- a/arch/i386/kernel/acpi/earlyquirk.c +++ b/arch/i386/kernel/acpi/earlyquirk.c | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <linux/pci.h> | 7 | #include <linux/pci.h> |
8 | #include <asm/pci-direct.h> | 8 | #include <asm/pci-direct.h> |
9 | #include <asm/acpi.h> | 9 | #include <asm/acpi.h> |
10 | #include <asm/apic.h> | ||
10 | 11 | ||
11 | static int __init check_bridge(int vendor, int device) | 12 | static int __init check_bridge(int vendor, int device) |
12 | { | 13 | { |
@@ -15,6 +16,7 @@ static int __init check_bridge(int vendor, int device) | |||
15 | if (vendor == PCI_VENDOR_ID_NVIDIA) { | 16 | if (vendor == PCI_VENDOR_ID_NVIDIA) { |
16 | acpi_skip_timer_override = 1; | 17 | acpi_skip_timer_override = 1; |
17 | } | 18 | } |
19 | #ifdef CONFIG_X86_LOCAL_APIC | ||
18 | /* | 20 | /* |
19 | * ATI IXP chipsets get double timer interrupts. | 21 | * ATI IXP chipsets get double timer interrupts. |
20 | * For now just do this for all ATI chipsets. | 22 | * For now just do this for all ATI chipsets. |
@@ -22,6 +24,7 @@ static int __init check_bridge(int vendor, int device) | |||
22 | */ | 24 | */ |
23 | if (vendor == PCI_VENDOR_ID_ATI) | 25 | if (vendor == PCI_VENDOR_ID_ATI) |
24 | disable_timer_pin_1 = 1; | 26 | disable_timer_pin_1 = 1; |
27 | #endif | ||
25 | return 0; | 28 | return 0; |
26 | } | 29 | } |
27 | 30 | ||