]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - drivers/scsi/NCR_D700.c
Merge commit 'v2.6.31-rc4' into next
[karo-tx-linux.git] / drivers / scsi / NCR_D700.c
index c889d8458684b002d5e03bd9bebf3a4e639cf4c4..1cdf09a4779a560532e7dc2edafc4dc4f91e2170 100644 (file)
@@ -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;