[Asterisk-cvs] zaptel pciradio.c, 1.8, 1.9 tor2.c, 1.23, 1.24 torisa.c, 1.11, 1.12 wcfxo.c, 1.29, 1.30 wct1xxp.c, 1.22, 1.23 wct4xxp.c, 1.55, 1.56 wctdm.c, 1.101, 1.102 wcte11xp.c, 1.8, 1.9 zaptel.c, 1.102, 1.103 ztdummy.c, 1.7, 1.8 ztdynamic.c, 1.10, 1.11

markster at lists.digium.com markster at lists.digium.com
Sat Jan 15 16:55:51 CST 2005 

Update of /usr/cvsroot/zaptel
In directory mongoose.digium.com:/tmp/cvs-serv4929

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:
Correct order of includes


Index: pciradio.c
===================================================================
RCS file: /usr/cvsroot/zaptel/pciradio.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pciradio.c	15 Jan 2005 06:45:15 -0000	1.8
+++ pciradio.c	15 Jan 2005 22:59:18 -0000	1.9
@@ -51,14 +51,14 @@
 #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
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 
 #define RAD_MAX_IFACES 128
 

Index: tor2.c
===================================================================
RCS file: /usr/cvsroot/zaptel/tor2.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- tor2.c	15 Jan 2005 06:45:15 -0000	1.23
+++ tor2.c	15 Jan 2005 22:59:18 -0000	1.24
@@ -34,14 +34,14 @@
 #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
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 #define NEED_PCI_IDS
 #include "tor2-hw.h"
 #include "tor2fw.h"

Index: torisa.c
===================================================================
RCS file: /usr/cvsroot/zaptel/torisa.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- torisa.c	15 Jan 2005 06:45:15 -0000	1.11
+++ torisa.c	15 Jan 2005 22:59:18 -0000	1.12
@@ -29,9 +29,6 @@
 #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"
@@ -39,6 +36,9 @@
 #include <linux/zaptel.h>
 #include <linux/torisa.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 
 /* Board address offsets (specified in word (not byte) offsets) */
 #define	DDATA 0			/* Data I/O Register */

Index: wcfxo.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcfxo.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- wcfxo.c	15 Jan 2005 06:45:15 -0000	1.29
+++ wcfxo.c	15 Jan 2005 22:59:18 -0000	1.30
@@ -31,14 +31,14 @@
 #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
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 
 /* Uncomment to enable tasklet handling in the FXO driver.  Not recommended
    in general, but may improve interactive performance */

Index: wct1xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct1xxp.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- wct1xxp.c	15 Jan 2005 06:45:15 -0000	1.22
+++ wct1xxp.c	15 Jan 2005 22:59:18 -0000	1.23
@@ -34,14 +34,14 @@
 #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
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 
 #define WC_MAX_CARDS	32
 

Index: wct4xxp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wct4xxp.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- wct4xxp.c	15 Jan 2005 06:45:15 -0000	1.55
+++ wct4xxp.c	15 Jan 2005 22:59:18 -0000	1.56
@@ -33,14 +33,14 @@
 #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
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 #include "wct4xxp.h"
 
 /*

Index: wctdm.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wctdm.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- wctdm.c	15 Jan 2005 06:45:15 -0000	1.101
+++ wctdm.c	15 Jan 2005 22:59:18 -0000	1.102
@@ -31,9 +31,6 @@
 #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"
 /*
@@ -207,6 +204,10 @@
 #include <linux/zaptel.h>
 #endif
 
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
+
 #define NUM_FXO_REGS 60
 
 #define WC_MAX_IFACES 128

Index: wcte11xp.c
===================================================================
RCS file: /usr/cvsroot/zaptel/wcte11xp.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wcte11xp.c	15 Jan 2005 06:45:15 -0000	1.8
+++ wcte11xp.c	15 Jan 2005 22:59:18 -0000	1.9
@@ -34,14 +34,14 @@
 #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
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 
 #include "wct4xxp.h"	/* For certain definitions */
 

Index: zaptel.c
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- zaptel.c	15 Jan 2005 06:45:15 -0000	1.102
+++ zaptel.c	15 Jan 2005 22:59:18 -0000	1.103
@@ -47,9 +47,6 @@
 #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 */
@@ -87,6 +84,10 @@
 #include <linux/zaptel.h>
 #endif
 
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
+
 /* Get helper arithmetic */
 #include "arith.h"
 #if defined(CONFIG_ZAPTEL_MMX) || defined(ECHO_CAN_FP)

Index: ztdummy.c
===================================================================
RCS file: /usr/cvsroot/zaptel/ztdummy.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ztdummy.c	15 Jan 2005 06:45:15 -0000	1.7
+++ ztdummy.c	15 Jan 2005 22:59:18 -0000	1.8
@@ -47,14 +47,15 @@
 #include <linux/usb.h>
 #include <linux/pci.h>
 #include <asm/io.h>
-#else
-#include <linux/moduleparam.h>
 #endif
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 #include "ztdummy.h"
 
 

Index: ztdynamic.c
===================================================================
RCS file: /usr/cvsroot/zaptel/ztdynamic.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ztdynamic.c	15 Jan 2005 06:45:15 -0000	1.10
+++ ztdynamic.c	15 Jan 2005 22:59:18 -0000	1.11
@@ -32,9 +32,6 @@
 #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
@@ -43,6 +40,9 @@
 #else
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 
 /*
  * Tasklets provide better system interactive response at the cost of the

More information about the svn-commits mailing list