---

yaml --- r: 311517 b: refs/heads/master c: f6b54f0 h: refs/heads/master i: 311515: 7d650ba v: v3
git-mirror · Jun 11, 2012 · 2d9356f · 2d9356f
1 parent 39c3a35
commit 2d9356f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f68b4c2e158019c2ec494b5cfbd9c83b4e5b253
+refs/heads/master: f6b54f083cc66cf9b11d2120d8df3c2ad4e0836d
diff --git a/trunk/arch/x86/kernel/acpi/boot.c b/trunk/arch/x86/kernel/acpi/boot.c
@@ -1470,6 +1470,14 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
 		     DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
 		     },
 	 },
+	{
+	 .callback = dmi_ignore_irq0_timer_override,
+	 .ident = "FUJITSU SIEMENS",
+	 .matches = {
+		     DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+		     DMI_MATCH(DMI_PRODUCT_NAME, "AMILO PRO V2030"),
+		     },
+	 },
 	{}
 };