diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-12-11 18:31:12 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-12-11 18:31:12 +0000 |
commit | bad17b1c21ccd80128ef47e6e04cba6ff78fa3ce (patch) | |
tree | 41c87035db1d7c0165ee821f5fcd63988c245268 /tor2.c | |
parent | 92deb968106ccb5fe80914c0c028840b4d1f1577 (diff) |
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/branches/1.4@1698 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; |