Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[pandora-kernel.git] / arch / sh / cchips / hd6446x / hd64461 / setup.c

diff --git a/arch/sh/cchips/hd6446x/hd64461/setup.c b/arch/sh/cchips/hd6446x/hd64461/setup.c
index ad12601..38f1e81 100644 (file)
--- a/arch/sh/cchips/hd6446x/hd64461/setup.c
+++ b/arch/sh/cchips/hd6446x/hd64461/setup.c
@@ -11,36 +11,28 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/irq.h>
-
 #include <asm/io.h>
 #include <asm/irq.h>
-
-#include <asm/hd64461/hd64461.h>
+#include <asm/hd64461.h>
 
 static void disable_hd64461_irq(unsigned int irq)
 {
-       unsigned long flags;
        unsigned short nimr;
        unsigned short mask = 1 << (irq - HD64461_IRQBASE);
 
-       local_irq_save(flags);
        nimr = inw(HD64461_NIMR);
        nimr |= mask;
        outw(nimr, HD64461_NIMR);
-       local_irq_restore(flags);
 }
 
 static void enable_hd64461_irq(unsigned int irq)
 {
-       unsigned long flags;
        unsigned short nimr;
        unsigned short mask = 1 << (irq - HD64461_IRQBASE);
 
-       local_irq_save(flags);
        nimr = inw(HD64461_NIMR);
        nimr &= ~mask;
        outw(nimr, HD64461_NIMR);
-       local_irq_restore(flags);
 }
 
 static void mask_and_ack_hd64461(unsigned int irq)