Message ID | 20090410124243.GA9852@helight |
---|---|
State | Accepted |
Commit | 67cd724f6d0919072a284f150a5761a160ac5cfa |
Headers | show |
On Fri, 2009-04-10 at 20:42 +0800, Zhenwen Xu wrote: > fix this warning: > > drivers/mtd/nand/cafe_nand.c: In function ‘cafe_nand_probe’: > drivers/mtd/nand/cafe_nand.c:730: warning: passing argument 2 of ‘request_irq’ from incompatible pointer type > > > From 8f877dd15fedd434e2f5d95a1bc5f4e528dc4528 Mon Sep 17 00:00:00 2001 > From: Zhenwen Xu <Helight.Xu@gmail.com> > Date: Fri, 10 Apr 2009 20:35:30 +0800 > Subject: [PATCH] fix a warning on drivers/mtd/nand/cafe_nand.c > > Signed-off-by: Zhenwen Xu <helight.xu@gmail.com> > --- > drivers/mtd/nand/cafe_nand.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Pushed, to l2-mtd-2.6.git. This does not guarantee anything, it just mean I'll ping dwmw2 to pull from that tree.
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index 7c5b257..29acd06 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c @@ -332,7 +332,7 @@ static void cafe_select_chip(struct mtd_info *mtd, int chipnr) cafe->ctl1 &= ~CTRL1_CHIPSELECT; } -static int cafe_nand_interrupt(int irq, void *id) +static irqreturn_t cafe_nand_interrupt(int irq, void *id) { struct mtd_info *mtd = id; struct cafe_priv *cafe = mtd->priv;