summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-01-15 06:45:15 +0000
committermarkster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-01-15 06:45:15 +0000
commitbe8facf1f605e21593b1d5133383cd5b494ef239 (patch)
tree9a712172b16b850ab23397f8c737c85abcc9cb5c
parent50ff7491ec8c027a9c14b8b43a64cc0d7a68c0b7 (diff)
Fix build for 2.4 kernel (bug #3343)
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@558 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rwxr-xr-xpciradio.c5
-rwxr-xr-xtor2.c4
-rwxr-xr-xtorisa.c5
-rwxr-xr-xwcfxo.c4
-rwxr-xr-xwct1xxp.c4
-rwxr-xr-xwct4xxp.c4
-rwxr-xr-xwctdm.c5
-rwxr-xr-xwcte11xp.c4
-rwxr-xr-xzaptel.c4
-rwxr-xr-xztdummy.c3
-rwxr-xr-xztdynamic.c4
11 files changed, 32 insertions, 14 deletions
diff --git a/pciradio.c b/pciradio.c
index 5bafc77..862c166 100755
--- a/pciradio.c
+++ b/pciradio.c
@@ -46,13 +46,14 @@ With driver: 303826 (1.5 %)
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
#include <asm/delay.h>
-
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
diff --git a/tor2.c b/tor2.c
index ede928e..b122605 100755
--- a/tor2.c
+++ b/tor2.c
@@ -30,11 +30,13 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
diff --git a/torisa.c b/torisa.c
index 41c35e0..daf1b07 100755
--- a/torisa.c
+++ b/torisa.c
@@ -25,12 +25,13 @@
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/ioport.h>
#include <asm/io.h>
-
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#include "torisa.h"
diff --git a/wcfxo.c b/wcfxo.c
index 55cd24e..d6c2474 100755
--- a/wcfxo.c
+++ b/wcfxo.c
@@ -27,11 +27,13 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/usb.h>
#include <linux/errno.h>
#include <linux/pci.h>
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
diff --git a/wct1xxp.c b/wct1xxp.c
index 12571fd..79ced23 100755
--- a/wct1xxp.c
+++ b/wct1xxp.c
@@ -29,12 +29,14 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/usb.h>
#include <linux/errno.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
diff --git a/wct4xxp.c b/wct4xxp.c
index 368fda2..ecad3c2 100755
--- a/wct4xxp.c
+++ b/wct4xxp.c
@@ -29,11 +29,13 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
diff --git a/wctdm.c b/wctdm.c
index b7cad2d..cc88d56 100755
--- a/wctdm.c
+++ b/wctdm.c
@@ -27,12 +27,13 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
-
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
#include "proslic.h"
#include "wctdm.h"
/*
diff --git a/wcte11xp.c b/wcte11xp.c
index 36b1512..9faa62e 100755
--- a/wcte11xp.c
+++ b/wcte11xp.c
@@ -29,12 +29,14 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/usb.h>
#include <linux/errno.h>
#include <linux/pci.h>
#include <linux/spinlock.h>
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
diff --git a/zaptel.c b/zaptel.c
index e6f9fdc..2f84b07 100755
--- a/zaptel.c
+++ b/zaptel.c
@@ -42,12 +42,14 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/proc_fs.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/version.h>
#include <linux/kmod.h>
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
#ifdef CONFIG_DEVFS_FS
#include <linux/devfs_fs_kernel.h>
#endif /* CONFIG_DEVFS_FS */
diff --git a/ztdummy.c b/ztdummy.c
index 481626a..7c131e7 100755
--- a/ztdummy.c
+++ b/ztdummy.c
@@ -41,13 +41,14 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/errno.h>
#ifndef LINUX26
#include <linux/usb.h>
#include <linux/pci.h>
#include <asm/io.h>
+#else
+#include <linux/moduleparam.h>
#endif
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
diff --git a/ztdynamic.c b/ztdynamic.c
index 5b032d6..22407be 100755
--- a/ztdynamic.c
+++ b/ztdynamic.c
@@ -26,13 +26,15 @@
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/module.h>
-#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/spinlock.h>
#include <linux/slab.h>
#include <linux/kmod.h>
#include <linux/sched.h>
#include <linux/interrupt.h>
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
#ifdef CONFIG_DEVFS_FS
#include <linux/devfs_fs_kernel.h>
#endif