summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-01-21 01:46:41 +0000
committermarkster <markster@5390a7c7-147a-4af0-8ec9-7488f05a26cb>2005-01-21 01:46:41 +0000
commitd4abecffcb475e6d472368850ccf3c7c40224a20 (patch)
treeee8b95a06a2c1c233a9e866414a0f862f24f4038
parent44c67fd3692d61cf24fcbc76045bccf096220c3c (diff)
Fix ztdummy build on 2.6 (bug #3391)
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@568 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rwxr-xr-xzaptel.h2
-rwxr-xr-xztdummy.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/zaptel.h b/zaptel.h
index 4bbf2b7..6d790ad 100755
--- a/zaptel.h
+++ b/zaptel.h
@@ -863,7 +863,7 @@ struct zt_tone_def { /* Structure for zone programming */
#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
diff --git a/ztdummy.c b/ztdummy.c
index 6bbb2d9..92a41d7 100755
--- a/ztdummy.c
+++ b/ztdummy.c
@@ -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