summaryrefslogtreecommitdiff
path: root/drivers/scsi/sgiwd93.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-11 11:56:12 +0400
committerJeff Garzik <jeff@garzik.org>2006-10-11 11:56:12 +0400
commit24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch)
tree7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/scsi/sgiwd93.c
parent2f614fe04f4463ff22234133319067d7361f54e5 (diff)
parent53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff)
downloadlinux-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.xz
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/scsi/sgiwd93.c')
-rw-r--r--drivers/scsi/sgiwd93.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c
index 4f1db6f2aae8..e81f97a35bc8 100644
--- a/drivers/scsi/sgiwd93.c
+++ b/drivers/scsi/sgiwd93.c
@@ -84,7 +84,7 @@ static inline unsigned long read_wd33c93_count(const wd33c93_regs regs)
return value;
}
-static irqreturn_t sgiwd93_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t sgiwd93_intr(int irq, void *dev_id)
{
struct Scsi_Host * host = (struct Scsi_Host *) dev_id;
unsigned long flags;