From 2d9356f6eb2a616ec9fcff88f7462df813846033 Mon Sep 17 00:00:00 2001 From: Feng Tang Date: Mon, 4 Jun 2012 15:00:06 +0800 Subject: [PATCH] --- yaml --- r: 311517 b: refs/heads/master c: f6b54f083cc66cf9b11d2120d8df3c2ad4e0836d h: refs/heads/master i: 311515: 7d650ba5dabf1b37b529e9662397370c936f9926 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/acpi/boot.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ed75d4a3caaa..ae7dbf443bef 100644 --- 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 index 3a6afba6eca7..b2297e58c6ed 100644 --- 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"), + }, + }, {} };