Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / sh / boards / landisk / landisk_pwb.c

diff --git a/arch/sh/boards/landisk/landisk_pwb.c b/arch/sh/boards/landisk/landisk_pwb.c
index e75cb578a28becfc1ec87c7c160dda9b10f7d3b5..e62524978160ac3fbb79448ea7d0656764bd2ee1 100644 (file)
--- a/arch/sh/boards/landisk/landisk_pwb.c
+++ b/arch/sh/boards/landisk/landisk_pwb.c
@@ -11,8 +11,6 @@
  *
  * LED control drive function added by kogiidena
  */
-
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/signal.h>
@@ -137,7 +135,7 @@ static int swdrv_write(struct file *filp, const char *buff, size_t count,
        return count;
 }
 
-static irqreturn_t sw_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t sw_interrupt(int irq, void *dev_id)
 {
        landisk_btn = (0x0ff & (~ctrl_inb(PA_STATUS)));
        disable_irq(IRQ_BUTTON);