LINUX26 is defined in zaptel.h, and should not be checked before

including it.


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3747 5390a7c7-147a-4af0-8ec9-7488f05a26cb

10 files changed, 19 insertions, 16 deletions

diff --git a/pciradio.c b/pciradio.c
index 2a41b1a..3cf1d47 100644
--- a/pciradio.c
+++ b/pciradio.c
@@ -52,11 +52,12 @@ With driver:	303826  (1.5 %)
 #include <linux/interrupt.h>
 #include <asm/io.h>
 #include <asm/delay.h> 
+
+#include "zaptel.h"
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
 
-#include "zaptel.h"
 
 #define RAD_MAX_IFACES 128
 
diff --git a/tor2.c b/tor2.c
index 799a1f6..c662cc1 100644
--- a/tor2.c
+++ b/tor2.c
@@ -32,11 +32,12 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
+
+#include "zaptel.h"
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
 #define NEED_PCI_IDS
-#include "zaptel.h"
 #include "tor2-hw.h"
 #include "tor2fw.h"
 
diff --git a/torisa.c b/torisa.c
index 755d6de..3b3b163 100644
--- a/torisa.c
+++ b/torisa.c
@@ -31,11 +31,12 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <asm/io.h>
+
+#include "zaptel.h"
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
 
-#include "zaptel.h"
 #include "torisa.h"
 
 /* Board address offsets (specified in word (not byte) offsets) */
diff --git a/wcfxo.c b/wcfxo.c
index 3d03e75..898d531 100644
--- a/wcfxo.c
+++ b/wcfxo.c
@@ -32,12 +32,12 @@
 #include <linux/errno.h>
 #include <linux/pci.h>
 #include <asm/io.h>
+
+#include "zaptel.h"
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
 
-#include "zaptel.h"
-
 /* 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 db39bf3..03be58b 100644
--- a/wct1xxp.c
+++ b/wct1xxp.c
@@ -32,12 +32,12 @@
 #include <linux/errno.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+
+#include "zaptel.h"
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
 
-#include "zaptel.h"
-
 #define WC_MAX_CARDS	32
 
 /*
diff --git a/wct4xxp/base.c b/wct4xxp/base.c
index 4f8decc..6c19929 100644
--- a/wct4xxp/base.c
+++ b/wct4xxp/base.c
@@ -33,12 +33,12 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
+
+#include "zaptel.h"
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
 
-#include "zaptel.h"
-
 #include "wct4xxp.h"
 #include "vpm450m.h"
 
diff --git a/wcte11xp.c b/wcte11xp.c
index ebe668a..016f205 100644
--- a/wcte11xp.c
+++ b/wcte11xp.c
@@ -34,12 +34,12 @@
 #include <linux/errno.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+
+#include "zaptel.h"
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
 
-#include "zaptel.h"
-
 /* XXX: fix this */
 #include "wct4xxp/wct4xxp.h"	/* For certain definitions */
 
diff --git a/ztdummy.c b/ztdummy.c
index e1f7916..f4198cf 100644
--- a/ztdummy.c
+++ b/ztdummy.c
@@ -74,6 +74,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/errno.h>
+#include "zaptel.h"
 
 #ifndef LINUX26
 #include <linux/usb.h>
@@ -90,7 +91,6 @@
 #include <linux/moduleparam.h>
 #endif
 
-#include "zaptel.h"
 #include "ztdummy.h"
 
 
diff --git a/ztdynamic.c b/ztdynamic.c
index 41b8382..e8623cc 100644
--- a/ztdynamic.c
+++ b/ztdynamic.c
@@ -36,12 +36,12 @@
 #ifdef CONFIG_DEVFS_FS
 #include <linux/devfs_fs_kernel.h>
 #endif
+
+#include "zaptel.h"
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
 
-#include "zaptel.h"
-
 /*
  * Tasklets provide better system interactive response at the cost of the
  * possibility of losing a frame of data at very infrequent intervals.  If
diff --git a/zttranscode.c b/zttranscode.c
index ea3ac30..a550969 100644
--- a/zttranscode.c
+++ b/zttranscode.c
@@ -39,12 +39,12 @@
 #ifdef CONFIG_DEVFS_FS
 #include <linux/devfs_fs_kernel.h>
 #endif
+
+#include "zaptel.h"
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif
 
-#include "zaptel.h"
-
 static int debug = 0;
 static struct zt_transcoder *trans;
 static spinlock_t translock = SPIN_LOCK_UNLOCKED;