[Asterisk-cvs] zaptel zaptel.h,1.40,1.41 ztdummy.c,1.8,1.9

[markster at lists.digium.com]

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

Modified Files:
	zaptel.h ztdummy.c 
Log Message:
Fix ztdummy build on 2.6 (bug #3391)


Index: zaptel.h
===================================================================
RCS file: /usr/cvsroot/zaptel/zaptel.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- zaptel.h	22 Dec 2004 04:44:26 -0000	1.40
+++ zaptel.h	21 Jan 2005 01:46:41 -0000	1.41
@@ -863,7 +863,7 @@
 #define	ZT_DEFAULT_PULSEAFTERTIME 750	/* 750ms between dial pulse digits */
 
 #define	ZT_MINPULSETIME (15 * 8)	/* 15 ms minimum */
-#define	ZT_MAXPULSETIME (150 * 8)	/* 150 ms maximum */
+#define	ZT_MAXPULSETIME (200 * 8)	/* 200 ms maximum */
 #define	ZT_PULSETIMEOUT ((ZT_MAXPULSETIME / 8) + 50)
 
 #define ZT_RINGTRAILER (50 * 8)	/* Don't consider a ring "over" until it's been gone at least this

Index: ztdummy.c
===================================================================
RCS file: /usr/cvsroot/zaptel/ztdummy.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ztdummy.c	15 Jan 2005 22:59:18 -0000	1.8
+++ ztdummy.c	21 Jan 2005 01:46:41 -0000	1.9
@@ -43,16 +43,16 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/errno.h>
-#ifndef LINUX26
-#include <linux/usb.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-#endif
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
 #else
 #include <linux/zaptel.h>
 #endif
+#ifndef LINUX26
+#include <linux/usb.h>
+#include <linux/pci.h>
+#include <asm/io.h>
+#endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>
 #endif