---

yaml --- r: 113375 b: refs/heads/master c: 8d89adf h: refs/heads/master i: 113373: 9aa2648 113371: 2fbe277 113367: 25e445a 113359: f1421de 113343: 3ca5859 v: v3
git-mirror · Oct 7, 2008 · e6b9f64 · e6b9f64
1 parent 1b9153c
commit e6b9f64
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33fb0e4eb53f16af312f9698f974e2e64af39c12
+refs/heads/master: 8d89adf44cf750e49691ba5b744b2ad77a05e997
diff --git a/trunk/arch/x86/kernel/acpi/boot.c b/trunk/arch/x86/kernel/acpi/boot.c
@@ -1421,8 +1421,16 @@ static int __init force_acpi_ht(const struct dmi_system_id *d)
  */
 static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
 {
-	pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n", d->ident);
-	acpi_skip_timer_override = 1;
+	/*
+	 * The ati_ixp4x0_rev() early PCI quirk should have set
+	 * the acpi_skip_timer_override flag already:
+	 */
+	if (!acpi_skip_timer_override) {
+		WARN(1, KERN_ERR "ati_ixp4x0 quirk not complete.\n");
+		pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n",
+			d->ident);
+		acpi_skip_timer_override = 1;
+	}
 	return 0;
 }