Merge branch 'linus' into x86/x2apic

[pandora-kernel.git] / arch / x86 / kernel / acpi / boot.c

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index b314bcd..b41b27a 100644 (file)
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1411,7 +1411,6 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
 {
        pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n", d->ident);
        acpi_skip_timer_override = 1;
-       force_mask_ioapic_irq_2();
        return 0;
 }