[svn-commits] trunk r1077 - in /trunk: ./ pciradio.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sat May 20 07:56:37 2006
New Revision: 1077

URL: http://svn.digium.com/view/zaptel?rev=1077&view=rev
Log:
Merged revisions 1076 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1076 | kpfleming | 2006-05-20 07:55:29 -0500 (Sat, 20 May 2006) | 2 lines

update module to work with kernels that don't include 2.4 module parameter compatibility macros (reported by tzafrir on asterisk-dev)

........

Modified:
    trunk/   (props changed)
    trunk/pciradio.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Sat May 20 07:56:37 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071,1076

Modified: trunk/pciradio.c
URL: http://svn.digium.com/view/zaptel/trunk/pciradio.c?rev=1077&r1=1076&r2=1077&view=diff
==============================================================================
--- trunk/pciradio.c (original)
+++ trunk/pciradio.c Sat May 20 07:56:37 2006
@@ -1807,15 +1807,18 @@
 	pci_unregister_driver(&pciradio_driver);
 }
 
+#ifdef LINUX26
+module_param(debug, int, 0600);
+#else
 MODULE_PARM(debug, "i");
-MODULE_DESCRIPTION("Zapate Telephony PCI Radio Card Zaptel Driver");
+#endif
+
+MODULE_DESCRIPTION("Zapata Telephony PCI Radio Card Zaptel Driver");
 MODULE_AUTHOR("Jim Dixon <jim at lambdatel.com>");
+
 #ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
 #endif
 
 module_init(pciradio_init);
 module_exit(pciradio_cleanup);
-
-
-