11 files changed, 35 insertions, 32 deletions
diff --git a/pciradio.c b/pciradio.c
index 862c166..862e437 100755
--- a/pciradio.c
+++ b/pciradio.c
@@ -51,14 +51,14 @@ With driver:	303826  (1.5 %)
 #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
 
diff --git a/tor2.c b/tor2.c
index b122605..f1efff9 100755
--- a/tor2.c
+++ b/tor2.c
@@ -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"
diff --git a/torisa.c b/torisa.c
index daf1b07..53b49fc 100755
--- a/torisa.c
+++ b/torisa.c
@@ -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 */
diff --git a/wcfxo.c b/wcfxo.c
index d6c2474..c765f3d 100755
--- a/wcfxo.c
+++ b/wcfxo.c
@@ -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 */
diff --git a/wct1xxp.c b/wct1xxp.c
index 79ced23..e014dcf 100755
--- a/wct1xxp.c
+++ b/wct1xxp.c
@@ -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
 
diff --git a/wct4xxp.c b/wct4xxp.c
index ecad3c2..94f6b0d 100755
--- a/wct4xxp.c
+++ b/wct4xxp.c
@@ -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"
 
 /*
diff --git a/wctdm.c b/wctdm.c
index cc88d56..663d631 100755
--- a/wctdm.c
+++ b/wctdm.c
@@ -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 @@ static struct fxo_mode {
 #include <linux/zaptel.h>
 #endif
 
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
+
 #define NUM_FXO_REGS 60
 
 #define WC_MAX_IFACES 128
diff --git a/wcte11xp.c b/wcte11xp.c
index 9faa62e..7a0e4da 100755
--- a/wcte11xp.c
+++ b/wcte11xp.c
@@ -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 */
 
diff --git a/zaptel.c b/zaptel.c
index 2f84b07..1bb0e32 100755
--- a/zaptel.c
+++ b/zaptel.c
@@ -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)
diff --git a/ztdummy.c b/ztdummy.c
index 7c131e7..6bbb2d9 100755
--- a/ztdummy.c
+++ b/ztdummy.c
@@ -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"
 
 
diff --git a/ztdynamic.c b/ztdynamic.c
index 22407be..4d959dd 100755
--- a/ztdynamic.c
+++ b/ztdynamic.c
@@ -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