Merge branch 's3c-move' into devel

[linux-2.6-omap-h63xx.git] / arch / arm / plat-mxc / irq.c

diff --git a/arch/arm/plat-mxc/irq.c b/arch/arm/plat-mxc/irq.c
index a41abf0bdd6649235b9ac64840aae5e1cf03fa34..d862c9e5f8dbc935a7f89ba5576746186427eb86 100644 (file)
--- a/arch/arm/plat-mxc/irq.c
+++ b/arch/arm/plat-mxc/irq.c
@@ -18,7 +18,7 @@
  */
 
 #include <linux/irq.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <mach/common.h>
 
 #define AVIC_BASE              IO_ADDRESS(AVIC_BASE_ADDR)
@@ -116,11 +116,6 @@ void __init mxc_init_irq(void)
        for (i = 0; i < 8; i++)
                __raw_writel(0, AVIC_NIPRIORITY(i));
 
-       /* Set WDOG2's interrupt the highest priority level (bit 28-31) */
-       reg = __raw_readl(AVIC_NIPRIORITY(6));
-       reg |= (0xF << 28);
-       __raw_writel(reg, AVIC_NIPRIORITY(6));
-
        /* init architectures chained interrupt handler */
        mxc_register_gpios();