diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
| commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
| tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /drivers/isdn/hisax/bkm_a4t.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/isdn/hisax/bkm_a4t.c')
| -rw-r--r-- | drivers/isdn/hisax/bkm_a4t.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c index 87a630128a6c..871310d56a6e 100644 --- a/drivers/isdn/hisax/bkm_a4t.c +++ b/drivers/isdn/hisax/bkm_a4t.c | |||
| @@ -125,7 +125,7 @@ WriteJADE(struct IsdnCardState *cs, int jade, u_char offset, u_char value) | |||
| 125 | #include "jade_irq.c" | 125 | #include "jade_irq.c" |
| 126 | 126 | ||
| 127 | static irqreturn_t | 127 | static irqreturn_t |
| 128 | bkm_interrupt(int intno, void *dev_id, struct pt_regs *regs) | 128 | bkm_interrupt(int intno, void *dev_id) |
| 129 | { | 129 | { |
| 130 | struct IsdnCardState *cs = dev_id; | 130 | struct IsdnCardState *cs = dev_id; |
| 131 | u_char val = 0; | 131 | u_char val = 0; |