Merge branch 'master' into upstream-fixes

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index dec41cc89937..62f1ac08332c 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -224,12 +224,11 @@ static int __devinit i2o_pci_alloc(struct i2o_controller *c)
  *      i2o_pci_interrupt - Interrupt handler for I2O controller
  *      @irq: interrupt line
  *      @dev_id: pointer to the I2O controller
- *      @r: pointer to registers
  *
  *      Handle an interrupt from a PCI based I2O controller. This turns out
  *      to be rather simple. We keep the controller pointer in the cookie.
  */
-static irqreturn_t i2o_pci_interrupt(int irq, void *dev_id, struct pt_regs *r)
+static irqreturn_t i2o_pci_interrupt(int irq, void *dev_id)
 {
         struct i2o_controller *c = dev_id;
         u32 m;