Merge branch 'doc' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[~andy/linux] / arch / x86 / kernel / time.c

diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
index c6eba2b4267361ada800b4e0797e4d6aec3607d7..24d3c91e9812f6f37be6b138deb8e0b6b23a30dd 100644 (file)
--- a/arch/x86/kernel/time.c
+++ b/arch/x86/kernel/time.c
@@ -14,7 +14,6 @@
 #include <linux/i8253.h>
 #include <linux/time.h>
 #include <linux/export.h>
-#include <linux/mca.h>
 
 #include <asm/vsyscall.h>
 #include <asm/x86_init.h>
@@ -58,11 +57,6 @@ EXPORT_SYMBOL(profile_pc);
 static irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
        global_clock_event->event_handler(global_clock_event);
-
-       /* MCA bus quirk: Acknowledge irq0 by setting bit 7 in port 0x61 */
-       if (MCA_bus)
-               outb_p(inb_p(0x61)| 0x80, 0x61);
-
        return IRQ_HANDLED;
 }