From bc25e0231f7baf7f3cd656d5889e2148f569a3d1 Mon Sep 17 00:00:00 2001
From: Zhenwen Xu <helight.xu@gmail.com>
Date: Tue, 12 May 2009 13:29:13 -0700
Subject: [PATCH] --- yaml --- r: 148049 b: refs/heads/master c:
 5a2537959fa8781012e8c286fc1614e0f6991327 h: refs/heads/master i:   148047:
 9e76b5a77f816e7f50683c07a91fc7eb38cde1c5 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/NCR_D700.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c491f345b328..7f18eb36fa80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9870d9a2428550e7ac3164a26306ad07a99051ae
+refs/heads/master: 5a2537959fa8781012e8c286fc1614e0f6991327
diff --git a/trunk/drivers/scsi/NCR_D700.c b/trunk/drivers/scsi/NCR_D700.c
index c889d8458684..1cdf09a4779a 100644
--- a/trunk/drivers/scsi/NCR_D700.c
+++ b/trunk/drivers/scsi/NCR_D700.c
@@ -224,7 +224,7 @@ NCR_D700_probe_one(struct NCR_D700_private *p, int siop, int irq,
 	return ret;
 }
 
-static int
+static irqreturn_t
 NCR_D700_intr(int irq, void *data)
 {
 	struct NCR_D700_private *p = (struct NCR_D700_private *)data;