diff --git a/[refs] b/[refs]
index c9a40834ce7b..96c0047bd09f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63c4dbd1023b9acd516d71635b06741962cc8a0f
+refs/heads/master: 2fc5577e1729ac303ad8b9547f8ccdb057076998
diff --git a/trunk/drivers/char/pcmcia/ipwireless/hardware.c b/trunk/drivers/char/pcmcia/ipwireless/hardware.c
index f948791c929d..0ccbbc1f593a 100644
--- a/trunk/drivers/char/pcmcia/ipwireless/hardware.c
+++ b/trunk/drivers/char/pcmcia/ipwireless/hardware.c
@@ -1196,7 +1196,7 @@ static irqreturn_t ipwireless_handle_v2_v3_interrupt(int irq,
 	return IRQ_HANDLED;
 }
 
-irqreturn_t ipwireless_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+irqreturn_t ipwireless_interrupt(int irq, void *dev_id)
 {
 	struct ipw_hardware *hw = dev_id;
 
diff --git a/trunk/drivers/char/pcmcia/ipwireless/hardware.h b/trunk/drivers/char/pcmcia/ipwireless/hardware.h
index 19ce5eb266b1..e21d23a922ac 100644
--- a/trunk/drivers/char/pcmcia/ipwireless/hardware.h
+++ b/trunk/drivers/char/pcmcia/ipwireless/hardware.h
@@ -34,7 +34,7 @@ struct ipw_network;
 
 struct ipw_hardware *ipwireless_hardware_create(void);
 void ipwireless_hardware_free(struct ipw_hardware *hw);
-irqreturn_t ipwireless_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+irqreturn_t ipwireless_interrupt(int irq, void *dev_id);
 int ipwireless_set_DTR(struct ipw_hardware *hw, unsigned int channel_idx,
 		int state);
 int ipwireless_set_RTS(struct ipw_hardware *hw, unsigned int channel_idx,