summaryrefslogtreecommitdiffstats
path: root/drivers/fc4/socal.c
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-12-13 00:13:32 +0100
committerDave Jones <davej@redhat.com>2006-12-13 00:13:32 +0100
commitf0eef25339f92f7cd4aeea23d9ae97987a5a1e82 (patch)
tree2472e94d39f43a9580a6d2d5d92de0b749023263 /drivers/fc4/socal.c
parent[AGPGART] VIA and SiS AGP chipsets are x86-only (diff)
parent[PATCH] remove config ordering/dependency between ucb1400-ts and sound subsystem (diff)
downloadlinux-f0eef25339f92f7cd4aeea23d9ae97987a5a1e82.tar.xz
linux-f0eef25339f92f7cd4aeea23d9ae97987a5a1e82.zip
Merge ../linus
Diffstat (limited to 'drivers/fc4/socal.c')
-rw-r--r--drivers/fc4/socal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fc4/socal.c b/drivers/fc4/socal.c
index 2b75edc5859d..a6b1ae256e16 100644
--- a/drivers/fc4/socal.c
+++ b/drivers/fc4/socal.c
@@ -404,7 +404,7 @@ update_out:
}
}
-static irqreturn_t socal_intr(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t socal_intr(int irq, void *dev_id)
{
u32 cmd;
unsigned long flags;