Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a217e8c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Fix fallout from ATI Xpress timer workaround 



ACPI earlyquirks needs to honor the proper config variables, and include
the right header file.

(Fixes commit 66759a01)

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 2ade8147

arch/i386/kernel/acpi/earlyquirk.c

+3 −0
Original line number Diff line number Diff line
@@ -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;

}