aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/acpi/earlyquirk.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c
index a7d22d9f3d7e..fa3255afc0f6 100644
--- a/arch/i386/kernel/acpi/earlyquirk.c
+++ b/arch/i386/kernel/acpi/earlyquirk.c
@@ -22,11 +22,14 @@ static int __init nvidia_hpet_check(struct acpi_table_header *header)
22 22
23static int __init check_bridge(int vendor, int device) 23static int __init check_bridge(int vendor, int device)
24{ 24{
25 static int warned;
25#ifdef CONFIG_ACPI 26#ifdef CONFIG_ACPI
26 /* According to Nvidia all timer overrides are bogus unless HPET 27 /* According to Nvidia all timer overrides are bogus unless HPET
27 is enabled. */ 28 is enabled. */
28 if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) { 29 if (!acpi_use_timer_override && vendor == PCI_VENDOR_ID_NVIDIA) {
29 if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check)) { 30 if (!warned && acpi_table_parse(ACPI_SIG_HPET,
31 nvidia_hpet_check)) {
32 warned = 1;
30 acpi_skip_timer_override = 1; 33 acpi_skip_timer_override = 1;
31 printk(KERN_INFO "Nvidia board " 34 printk(KERN_INFO "Nvidia board "
32 "detected. Ignoring ACPI " 35 "detected. Ignoring ACPI "