[Asterisk-cvs] zaptel pciradio.c, 1.7, 1.8 tor2.c, 1.22,
1.23 torisa.c, 1.10, 1.11 wcfxo.c, 1.28, 1.29 wct1xxp.c, 1.21,
1.22 wct4xxp.c, 1.54, 1.55 wctdm.c, 1.100, 1.101 wcte11xp.c,
1.7, 1.8 zaptel.c, 1.101, 1.102 ztdummy.c, 1.6,
1.7 ztdynamic.c, 1.9, 1.10
markster at lists.digium.com
markster at lists.digium.com
Sat Jan 15 00:41:33 CST 2005
Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv32438
Modified Files:
pciradio.c tor2.c torisa.c wcfxo.c wct1xxp.c wct4xxp.c wctdm.c
wcte11xp.c zaptel.c ztdummy.c ztdynamic.c
Log Message:
Fix build for 2.4 kernel (bug #3343)
Index: pciradio.c
===================================================================
RCS file: /usr/cvsroot/zaptel/pciradio.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- pciradio.c 14 Jan 2005 06:10:14 -0000 1.7
+++ pciradio.c 15 Jan 2005 06:45:15 -0000 1.8
@@ -46,13 +46,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>
#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
Index: tor2.c
===================================================================
RCS file: /usr/cvsroot/zaptel/tor2.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- tor2.c 14 Jan 2005 06:10:14 -0000 1.22
+++ tor2.c 15 Jan 2005 06:45:15 -0000 1.23
@@ -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
Index: torisa.c
===================================================================
RCS file: /usr/cvsroot/zaptel/torisa.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- torisa.c 14 Jan 2005 06:10:14 -0000 1.10
+++ torisa.c 15 Jan 2005 06:45:15 -0000 1.11
@@ -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"
Index: wcfxo.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcfxo.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- wcfxo.c 14 Jan 2005 06:10:14 -0000 1.28
+++ wcfxo.c 15 Jan 2005 06:45:15 -0000 1.29
@@ -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
Index: wct1xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct1xxp.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- wct1xxp.c 14 Jan 2005 06:10:14 -0000 1.21
+++ wct1xxp.c 15 Jan 2005 06:45:15 -0000 1.22
@@ -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
Index: wct4xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct4xxp.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- wct4xxp.c 14 Jan 2005 06:10:14 -0000 1.54
+++ wct4xxp.c 15 Jan 2005 06:45:15 -0000 1.55
@@ -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
Index: wctdm.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wctdm.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- wctdm.c 14 Jan 2005 06:10:14 -0000 1.100
+++ wctdm.c 15 Jan 2005 06:45:15 -0000 1.101
@@ -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"
/*
Index: wcte11xp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcte11xp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- wcte11xp.c 14 Jan 2005 06:10:14 -0000 1.7
+++ wcte11xp.c 15 Jan 2005 06:45:15 -0000 1.8
@@ -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
Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- zaptel.c 14 Jan 2005 06:10:14 -0000 1.101
+++ zaptel.c 15 Jan 2005 06:45:15 -0000 1.102
@@ -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 */
Index: ztdummy.c
===================================================================
RCS file: /usr/cvsroot/zaptel/ztdummy.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ztdummy.c 14 Jan 2005 06:10:14 -0000 1.6
+++ ztdummy.c 15 Jan 2005 06:45:15 -0000 1.7
@@ -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"
Index: ztdynamic.c
===================================================================
RCS file: /usr/cvsroot/zaptel/ztdynamic.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ztdynamic.c 14 Jan 2005 06:10:14 -0000 1.9
+++ ztdynamic.c 15 Jan 2005 06:45:15 -0000 1.10
@@ -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
More information about the svn-commits
mailing list