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/asuscom.c | |
| parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/isdn/hisax/asuscom.c')
| -rw-r--r-- | drivers/isdn/hisax/asuscom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/asuscom.c b/drivers/isdn/hisax/asuscom.c index 93ff941c48f1..61e69e9c4aa9 100644 --- a/drivers/isdn/hisax/asuscom.c +++ b/drivers/isdn/hisax/asuscom.c | |||
| @@ -156,7 +156,7 @@ WriteHSCX(struct IsdnCardState *cs, int hscx, u_char offset, u_char value) | |||
| 156 | #include "hscx_irq.c" | 156 | #include "hscx_irq.c" |
| 157 | 157 | ||
| 158 | static irqreturn_t | 158 | static irqreturn_t |
| 159 | asuscom_interrupt(int intno, void *dev_id, struct pt_regs *regs) | 159 | asuscom_interrupt(int intno, void *dev_id) |
| 160 | { | 160 | { |
| 161 | struct IsdnCardState *cs = dev_id; | 161 | struct IsdnCardState *cs = dev_id; |
| 162 | u_char val; | 162 | u_char val; |
| @@ -194,7 +194,7 @@ asuscom_interrupt(int intno, void *dev_id, struct pt_regs *regs) | |||
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | static irqreturn_t | 196 | static irqreturn_t |
| 197 | asuscom_interrupt_ipac(int intno, void *dev_id, struct pt_regs *regs) | 197 | asuscom_interrupt_ipac(int intno, void *dev_id) |
| 198 | { | 198 | { |
| 199 | struct IsdnCardState *cs = dev_id; | 199 | struct IsdnCardState *cs = dev_id; |
| 200 | u_char ista, val, icnt = 5; | 200 | u_char ista, val, icnt = 5; |