diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /drivers/mtd/nand/cafe_nand.c | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/mtd/nand/cafe_nand.c')
| -rw-r--r-- | drivers/mtd/nand/cafe_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index 7c5b257ce8e4..29acd06b1c39 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) | |||
| 332 | cafe->ctl1 &= ~CTRL1_CHIPSELECT; | 332 | cafe->ctl1 &= ~CTRL1_CHIPSELECT; |
| 333 | } | 333 | } |
| 334 | 334 | ||
| 335 | static int cafe_nand_interrupt(int irq, void *id) | 335 | static irqreturn_t cafe_nand_interrupt(int irq, void *id) |
| 336 | { | 336 | { |
| 337 | struct mtd_info *mtd = id; | 337 | struct mtd_info *mtd = id; |
| 338 | struct cafe_priv *cafe = mtd->priv; | 338 | struct cafe_priv *cafe = mtd->priv; |