From: Feng Tang Date: Mon, 4 Jun 2012 07:00:05 +0000 (+0800) Subject: ACPI: Remove one board specific WARN when ignoring timer overriding X-Git-Tag: v2.6.39-400.9.0~303^2~33 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c8184796df97f84edd9b1d1b107c2a3d7bc6aad9;p=users%2Fjedix%2Flinux-maple.git ACPI: Remove one board specific WARN when ignoring timer overriding commit 7f68b4c2e158019c2ec494b5cfbd9c83b4e5b253 upstream. Current WARN msg is only for the ati_ixp4x0 board, while this function is used by mulitple platforms. So this one board specific warning is not appropriate any more. Signed-off-by: Feng Tang Signed-off-by: Len Brown Signed-off-by: Greg Kroah-Hartman Signed-off-by: Guangyu Sun --- diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index dcd9bbfd3360..ae79e87f79d4 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -1351,12 +1351,7 @@ static int __init dmi_disable_acpi(const struct dmi_system_id *d) */ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d) { - /* - * 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 override\n", d->ident); acpi_skip_timer_override = 1;