Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6] / drivers / scsi / a3000.c

diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index 7bf46d40b5610d8a85ca30b99a213241ea735e31..1299bc8edef18b3a435a004e307418fea27598ba 100644 (file)
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -26,7 +26,7 @@
 
 static struct Scsi_Host *a3000_host = NULL;
 
-static irqreturn_t a3000_intr (int irq, void *dummy, struct pt_regs *fp)
+static irqreturn_t a3000_intr (int irq, void *dummy)
 {
        unsigned long flags;
        unsigned int status = DMA(a3000_host)->ISTR;