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 /tor2.c | |
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 'tor2.c')
-rw-r--r-- | tor2.c | 13 |
1 files changed, 2 insertions, 11 deletions
@@ -190,12 +190,7 @@ static int tor2_shutdown(struct zt_span *span); static int tor2_rbsbits(struct zt_chan *chan, int bits); static int tor2_maint(struct zt_span *span, int cmd); static int tor2_ioctl(struct zt_chan *chan, unsigned int cmd, unsigned long data); -#ifdef LINUX26 -static irqreturn_t tor2_intr(int irq, void *dev_id, struct pt_regs *regs); -#else -static void tor2_intr(int irq, void *dev_id, struct pt_regs *regs); -#endif - +ZAP_IRQ_HANDLER(tor2_intr); /* translations of data channels for 24 channels in a 32 bit PCM highway */ unsigned datxlt_t1[] = { @@ -1188,11 +1183,7 @@ found: return 0; } -#ifdef LINUX26 -static irqreturn_t tor2_intr(int irq, void *dev_id, struct pt_regs *regs) -#else -static void tor2_intr(int irq, void *dev_id, struct pt_regs *regs) -#endif +ZAP_IRQ_HANDLER(tor2_intr) { int n, i, j, k, syncsrc; unsigned int rxword,txword; |