From d7e167964b58a3b29651f5fbbdd83b8ef111850f Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Wed, 22 Apr 2009 15:02:23 +0100
Subject: [PATCH] --- yaml --- r: 143975 b: refs/heads/master c:
 67cd724f6d0919072a284f150a5761a160ac5cfa h: refs/heads/master i:   143973:
 353bce96a48956d9e22431432a1548a70eb049fc   143971:
 2b7aaa9f263f3f35928201b82a03907dfbb6ba47   143967:
 a0c1254c80c57d89f848eced980c769253c1098e v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/mtd/nand/cafe_nand.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8c1aa1ae5fe2..dc06d02b002c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97c68d00dbb2decda4b3dce79ce55df04246a834
+refs/heads/master: 67cd724f6d0919072a284f150a5761a160ac5cfa
diff --git a/trunk/drivers/mtd/nand/cafe_nand.c b/trunk/drivers/mtd/nand/cafe_nand.c
index 7c5b257ce8e4..29acd06b1c39 100644
--- a/trunk/drivers/mtd/nand/cafe_nand.c
+++ b/trunk/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;