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, 11 insertions, 0 deletions

diff --git a/tor2.c b/tor2.c
index 0311f55..f68228c 100755
--- a/tor2.c
+++ b/tor2.c
@@ -39,6 +39,9 @@
 #else
 #include <linux/zaptel.h>
 #endif
+#ifdef LINUX26
+#include <linux/moduleparam.h>
+#endif
 #define NEED_PCI_IDS
 #include "tor2-hw.h"
 #include "tor2fw.h"
@@ -1482,10 +1485,18 @@ MODULE_DESCRIPTION("Tormenta 2 PCI Quad T1 or E1 Zaptel Driver");
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif
+
+#ifdef LINUX26
+module_param(debug, int, 0600);
+module_param(loopback, int, 0600);
+module_param(timingcable, int, 0600);
+module_param(japan, int, 0600);
+#else
 MODULE_PARM(debug, "i");
 MODULE_PARM(loopback, "i");
 MODULE_PARM(timingcable, "i");
 MODULE_PARM(japan, "i");
+#endif
 
 MODULE_DEVICE_TABLE(pci, tor2_pci_ids);