aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2012-06-04 03:00:05 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 11:47:52 -0400
commit05e3b20ed735718a6fecbeb1f1234c15628145f0 (patch)
tree5b492e4b74cf4eb35889b8fb476e46eb64ed26bb
parent62aae691aaecc2695294cfdc6719f7bd5bbcd9c6 (diff)
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 <feng.tang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/kernel/acpi/boot.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 9650bccc77b..479d03c9c4c 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1333,12 +1333,7 @@ static int __init dmi_disable_acpi(const struct dmi_system_id *d)
1333 */ 1333 */
1334static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d) 1334static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
1335{ 1335{
1336 /*
1337 * The ati_ixp4x0_rev() early PCI quirk should have set
1338 * the acpi_skip_timer_override flag already:
1339 */
1340 if (!acpi_skip_timer_override) { 1336 if (!acpi_skip_timer_override) {
1341 WARN(1, KERN_ERR "ati_ixp4x0 quirk not complete.\n");
1342 pr_notice("%s detected: Ignoring BIOS IRQ0 override\n", 1337 pr_notice("%s detected: Ignoring BIOS IRQ0 override\n",
1343 d->ident); 1338 d->ident);
1344 acpi_skip_timer_override = 1; 1339 acpi_skip_timer_override = 1;