summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeng Tang <feng.tang@intel.com>2012-06-04 15:00:05 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-16 09:04:07 -0700
commit5752cdb805ff89942d99d12118e2844e7db34df8 (patch)
treeff9bf40bee38ffbdf2b1c15946f103c2d2f3e27f
parent371122fc6eef7cafc8acaf0891fd15cf623388a3 (diff)
downloadlinux-3.10-5752cdb805ff89942d99d12118e2844e7db34df8.tar.gz
linux-3.10-5752cdb805ff89942d99d12118e2844e7db34df8.tar.bz2
linux-3.10-5752cdb805ff89942d99d12118e2844e7db34df8.zip
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 9b3d328ade5..2b84bc38857 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1340,12 +1340,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;