summaryrefslogtreecommitdiff
path: root/zaptel.h
diff options
context:
space:
mode:
authorkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-12-11 18:34:20 +0000
committerkpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2006-12-11 18:34:20 +0000
commitee074dba8e79e5f405700ba7907b58572fbea8cb (patch)
tree214e2dd87c99d70a25e1a258e3a196406041fc15 /zaptel.h
parentc25e581f257e416f2f02144fdac2d6e3a78712d9 (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 'zaptel.h')
-rw-r--r--zaptel.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/zaptel.h b/zaptel.h
index 17a7503..b7850c4 100644
--- a/zaptel.h
+++ b/zaptel.h
@@ -59,6 +59,16 @@
#define zap_pci_module pci_module_init
#endif
+#ifdef LINUX26
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19)
+#define ZAP_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id)
+#else
+#define ZAP_IRQ_HANDLER(a) static irqreturn_t a(int irq, void *dev_id, struct pt_regs *regs)
+#endif
+#else
+#define ZAP_IRQ_HANDLER(a) static void a(int irq, void *dev_id, struct pt_regs *regs)
+#endif
+
#include "ecdis.h"
#include "fasthdlc.h"