git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/hda' into for-linus
[pandora-kernel.git]
/
drivers
/
mtd
/
nand
/
cafe_nand.c
diff --git
a/drivers/mtd/nand/cafe_nand.c
b/drivers/mtd/nand/cafe_nand.c
index
7c5b257
..
29acd06
100644
(file)
--- 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 i
n
t cafe_nand_interrupt(int irq, void *id)
+static i
rqreturn_
t cafe_nand_interrupt(int irq, void *id)
{
struct mtd_info *mtd = id;
struct cafe_priv *cafe = mtd->priv;