Bug#368145: pciradio.c:1810: error: syntax error before string constant

[Tzafrir Cohen]

On Sat, May 20, 2006 at 01:08:55PM +0200, Stephan Seitz wrote:
> On Fri, May 19, 2006 at 05:02:44PM -0700, ms419 at freezone.co.uk wrote:
> >/home/jablko/src/modules/zaptel/pciradio.c:1810: error: syntax error  
> >before string constant
> >/home/jablko/src/modules/zaptel/pciradio.c:1810: warning: type defaults  
> >to 'int' in declaration of 'MODULE_PARM'
> >/home/jablko/src/modules/zaptel/pciradio.c:1810: warning: function 
> >declaration isn't a prototype
> >/home/jablko/src/modules/zaptel/pciradio.c:1810: warning: data definition 
> >has no type or storage class
> 
> >make[4]: Leaving directory 
> >>`/home/jablko/src/kernel/linux-2.6.17-rc3-mm1-tor-200605030'
> 						      ^^^^^^^^^^^^^^^^^
> 
> Since 2.6.17 the old MODULE_PARM parameter doesn’t exist anymore. You 
> have to use a new function defined in moduleparam.h (I think it is called 
> moduleparam(<name>, <type>, <default>), e.g. moduleparam(debug, int, 0);).
> Patch the zaptel source, wait for someone else to do it or use 2.6.16 
> kernel.

Upstream has just commited:

   svn diff -r 1075:1076 http://svn.digium.com/svn/zaptel/branches/1.2/


Index: pciradio.c
===================================================================
--- pciradio.c	(revision 1075)
+++ pciradio.c	(revision 1076)
@@ -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);
-
-
-

Is that good enough?

-- 
Tzafrir Cohen      sip:tzafrir at local.xorcom.com
icq#16849755       iax:tzafrir at local.xorcom.com
+972-50-7952406           
tzafrir.cohen at xorcom.com  http://www.xorcom.com