Merge branch 'for-2.6.28' of git://git.kernel.dk/linux-2.6-block

[linux-2.6-omap-h63xx.git] / drivers / misc / ibmasm / lowlevel.c

diff --git a/drivers/misc/ibmasm/lowlevel.c b/drivers/misc/ibmasm/lowlevel.c
index 47949a2c7e94f752e737e4e7b0be00e6aee5ff39..4b2398e27fd5bf202efa349db4bc4bd4a3e1f899 100644 (file)
--- a/drivers/misc/ibmasm/lowlevel.c
+++ b/drivers/misc/ibmasm/lowlevel.c
@@ -17,7 +17,7 @@
  *
  * Copyright (C) IBM Corporation, 2004
  *
- * Author: Max Asböck <amax@us.ibm.com> 
+ * Author: Max Asböck <amax@us.ibm.com>
  *
  */
 
@@ -54,7 +54,7 @@ int ibmasm_send_i2o_message(struct service_processor *sp)
        return 0;
 }
 
-irqreturn_t ibmasm_interrupt_handler(int irq, void * dev_id, struct pt_regs *regs)
+irqreturn_t ibmasm_interrupt_handler(int irq, void * dev_id)
 {
        u32     mfa;
        struct service_processor *sp = (struct service_processor *)dev_id;
@@ -67,7 +67,7 @@ irqreturn_t ibmasm_interrupt_handler(int irq, void * dev_id, struct pt_regs *reg
        dbg("respond to interrupt at %s\n", get_timestamp(tsbuf));
 
        if (mouse_interrupt_pending(sp)) {
-               ibmasm_handle_mouse_interrupt(sp, regs);
+               ibmasm_handle_mouse_interrupt(sp);
                clear_mouse_interrupt(sp);
        }