diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-06 03:03:43 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-06 03:03:43 +0200 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/isdn/hisax/nj_s.c | |
| parent | [PATCH] libata: Don't believe bogus claims in the older PIO mode register (diff) | |
| parent | Merge git://git.infradead.org/~dhowells/irq-2.6 (diff) | |
| download | linux-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.tar.xz linux-4ad99f15c6a3cadf36928c399459ea4fdb3d49f9.zip | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/isdn/hisax/nj_s.c')
| -rw-r--r-- | drivers/isdn/hisax/nj_s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c index 80025fd890f4..c09ffb135330 100644 --- a/drivers/isdn/hisax/nj_s.c +++ b/drivers/isdn/hisax/nj_s.c @@ -26,7 +26,7 @@ static void dummywr(struct IsdnCardState *cs, int chan, u_char off, u_char value } static irqreturn_t -netjet_s_interrupt(int intno, void *dev_id, struct pt_regs *regs) +netjet_s_interrupt(int intno, void *dev_id) { struct IsdnCardState *cs = dev_id; u_char val, s1val, s0val; |