kernel 2.6.19 API changes compatibility

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1697 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 2 insertions, 11 deletions

diff --git a/tor2.c b/tor2.c
index 02aba05..cbb1a8c 100644
--- a/tor2.c
+++ b/tor2.c
@@ -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;