diff --git a/[refs] b/[refs] index 5fbdf39f23ca..ed428260f749 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e079f495b77726fafb77dd531873ec0daac34078 +refs/heads/master: b1d1c8dd35aa95fbeb7051eee9811fc2475a81f4 diff --git a/trunk/drivers/char/mxser_new.c b/trunk/drivers/char/mxser_new.c index a3328bb147b9..7709cd865fff 100644 --- a/trunk/drivers/char/mxser_new.c +++ b/trunk/drivers/char/mxser_new.c @@ -2265,7 +2265,7 @@ static void mxser_transmit_chars(struct mxser_port *port) /* * This is the serial driver's generic interrupt routine */ -static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs) +static irqreturn_t mxser_interrupt(int irq, void *dev_id) { int status, iir, i; struct mxser_board *brd = NULL;