Merge git://git.infradead.org/~dhowells/irq-2.6

* git://git.infradead.org/~dhowells/irq-2.6:
  IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
  IRQ: Typedef the IRQ handler function type
  IRQ: Typedef the IRQ flow handler function type

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
index b9568e10965a..8895f026bea7 100644
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
@@ -1890,12 +1890,12 @@ static inline void lanai_int_1(struct lanai_dev *lanai, u32 reason)
                 reg_write(lanai, ack, IntAck_Reg);
 }
 
-static irqreturn_t lanai_int(int irq, void *devid, struct pt_regs *regs)
+static irqreturn_t lanai_int(int irq, void *devid)
 {
         struct lanai_dev *lanai = (struct lanai_dev *) devid;
         u32 reason;
 
-        (void) irq; (void) regs;        /* unused variables */
+        (void) irq;     /* unused variables */
 
 #ifdef USE_POWERDOWN
         /*