diff --git a/[refs] b/[refs] index bf051c4d4dac..5479443ee544 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 103e40f6330306753ba11548d53ff25144216236 +refs/heads/master: 28bdd4a72d158083b7c7f56ec4ef5dfaf75d9464 diff --git a/trunk/drivers/mtd/nand/cafe.c b/trunk/drivers/mtd/nand/cafe.c index fad304bf7b7e..c0a5ec125907 100644 --- a/trunk/drivers/mtd/nand/cafe.c +++ b/trunk/drivers/mtd/nand/cafe.c @@ -312,7 +312,7 @@ static void cafe_select_chip(struct mtd_info *mtd, int chipnr) // cafe_dev_dbg(&cafe->pdev->dev, "select_chip %d\n", chipnr); } -static int cafe_nand_interrupt(int irq, void *id, struct pt_regs *regs) +static int cafe_nand_interrupt(int irq, void *id) { struct mtd_info *mtd = id; struct cafe_priv *cafe = mtd->priv;