summaryrefslogtreecommitdiff
path: root/drivers/isdn/hisax/hfcscard.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/isdn/hisax/hfcscard.c
parent2f614fe04f4463ff22234133319067d7361f54e5 (diff)
parent53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff)
downloadlinux-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.xz
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/isdn/hisax/hfcscard.c')
-rw-r--r--drivers/isdn/hisax/hfcscard.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/hfcscard.c b/drivers/isdn/hisax/hfcscard.c
index 4e7f472877e9..57670dc5034d 100644
--- a/drivers/isdn/hisax/hfcscard.c
+++ b/drivers/isdn/hisax/hfcscard.c
@@ -21,7 +21,7 @@ extern const char *CardType[];
static const char *hfcs_revision = "$Revision: 1.10.2.4 $";
static irqreturn_t
-hfcs_interrupt(int intno, void *dev_id, struct pt_regs *regs)
+hfcs_interrupt(int intno, void *dev_id)
{
struct IsdnCardState *cs = dev_id;
u_char val, stat;