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/hysdn/boardergo.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/isdn/hysdn/boardergo.c')
| -rw-r--r-- | drivers/isdn/hysdn/boardergo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/hysdn/boardergo.c b/drivers/isdn/hysdn/boardergo.c index 73afebdf80bd..160f22fa5941 100644 --- a/drivers/isdn/hysdn/boardergo.c +++ b/drivers/isdn/hysdn/boardergo.c | |||
| @@ -33,7 +33,7 @@ | |||
| 33 | /* The cards interrupt handler. Called from system */ | 33 | /* The cards interrupt handler. Called from system */ |
| 34 | /***************************************************/ | 34 | /***************************************************/ |
| 35 | static irqreturn_t | 35 | static irqreturn_t |
| 36 | ergo_interrupt(int intno, void *dev_id, struct pt_regs *regs) | 36 | ergo_interrupt(int intno, void *dev_id) |
| 37 | { | 37 | { |
| 38 | hysdn_card *card = dev_id; /* parameter from irq */ | 38 | hysdn_card *card = dev_id; /* parameter from irq */ |
| 39 | tErgDpram *dpr; | 39 | tErgDpram *dpr; |