diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-12-11 18:34:20 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-12-11 18:34:20 +0000 |
| commit | ee074dba8e79e5f405700ba7907b58572fbea8cb (patch) | |
| tree | 214e2dd87c99d70a25e1a258e3a196406041fc15 /wct4xxp | |
| parent | c25e581f257e416f2f02144fdac2d6e3a78712d9 (diff) | |
Merged revisions 1698 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r1698 | kpfleming | 2006-12-11 12:31:12 -0600 (Mon, 11 Dec 2006) | 10 lines
Merged revisions 1697 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r1697 | kpfleming | 2006-12-11 12:27:15 -0600 (Mon, 11 Dec 2006) | 2 lines
kernel 2.6.19 API changes compatibility
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1699 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'wct4xxp')
| -rw-r--r-- | wct4xxp/base.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/wct4xxp/base.c b/wct4xxp/base.c index 54f13dc..abedb72 100644 --- a/wct4xxp/base.c +++ b/wct4xxp/base.c @@ -2718,11 +2718,7 @@ static inline void __t4_framer_interrupt(struct t4 *wc, int span) } #ifdef SUPPORT_GEN1 -#ifdef LINUX26 -static irqreturn_t t4_interrupt(int irq, void *dev_id, struct pt_regs *regs) -#else -static void t4_interrupt(int irq, void *dev_id, struct pt_regs *regs) -#endif +ZAP_IRQ_HANDLER(t4_interrupt) { struct t4 *wc = dev_id; unsigned long flags; @@ -2822,11 +2818,7 @@ static void t4_interrupt(int irq, void *dev_id, struct pt_regs *regs) #endif -#ifdef LINUX26 -static irqreturn_t t4_interrupt_gen2(int irq, void *dev_id, struct pt_regs *regs) -#else -static void t4_interrupt_gen2(int irq, void *dev_id, struct pt_regs *regs) -#endif +ZAP_IRQ_HANDLER(t4_interrupt_gen2) { struct t4 *wc = dev_id; unsigned long flags; |