all of the fixes for 2.6 from HEAD ... I think things are calm now

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

1 files changed, 10 insertions, 0 deletions

diff --git a/zaptel.c b/zaptel.c
index 2afd616..c07bbd4 100755
--- a/zaptel.c
+++ b/zaptel.c
@@ -84,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)
@@ -6209,8 +6213,14 @@ MODULE_DESCRIPTION("Zapata Telephony Interface");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif
+
+#ifdef LINUX26
+module_param(debug, int, 0600);
+module_param(deftaps, int, 0600);
+#else
 MODULE_PARM(debug, "i");
 MODULE_PARM(deftaps, "i");
+#endif
 
 static struct file_operations zt_fops = {
 	owner: THIS_MODULE,