ARM: OMAP: PalmZ71 extra brace fix

[linux-2.6-omap-h63xx.git] / arch / arm / mach-ixp4xx / nas100d-power.c

diff --git a/arch/arm/mach-ixp4xx/nas100d-power.c b/arch/arm/mach-ixp4xx/nas100d-power.c
index a3745ed37f9fc5c81e75bf491cc00c8d83e46835..29aa98d3a7faeb4993213e29aee093fe0f389f88 100644 (file)
--- a/arch/arm/mach-ixp4xx/nas100d-power.c
+++ b/arch/arm/mach-ixp4xx/nas100d-power.c
@@ -17,14 +17,14 @@
  *
  */
 
-#include <linux/module.h>
-#include <linux/reboot.h>
 #include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/module.h>
 #include <linux/reboot.h>
 
 #include <asm/mach-types.h>
 
-static irqreturn_t nas100d_reset_handler(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t nas100d_reset_handler(int irq, void *dev_id)
 {
        /* Signal init to do the ctrlaltdel action, this will bypass init if
         * it hasn't started and do a kernel_restart.
@@ -42,7 +42,7 @@ static int __init nas100d_power_init(void)
        set_irq_type(NAS100D_RB_IRQ, IRQT_LOW);
 
        if (request_irq(NAS100D_RB_IRQ, &nas100d_reset_handler,
-               SA_INTERRUPT, "NAS100D reset button", NULL) < 0) {
+               IRQF_DISABLED, "NAS100D reset button", NULL) < 0) {
 
                printk(KERN_DEBUG "Reset Button IRQ %d not available\n",
                        NAS100D_RB_IRQ);