[zaptel-commits] branch 1.2 r973 - in /branches/1.2/xpp: ./ xpd.h xpp_usb.c

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Fri Mar  3 14:14:09 2006
New Revision: 973

URL: http://svn.digium.com/view/zaptel?rev=973&view=rev
Log:
small compilation issues

Modified:
    branches/1.2/xpp/   (props changed)
    branches/1.2/xpp/xpd.h
    branches/1.2/xpp/xpp_usb.c

Propchange: branches/1.2/xpp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar  3 14:14:09 2006
@@ -1,0 +1,5 @@
+*.o
+*.ko
+*.o.cmd
+*.ko.cmd
+*.mod.c

Modified: branches/1.2/xpp/xpd.h
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/xpd.h?rev=973&r1=972&r2=973&view=diff
==============================================================================
--- branches/1.2/xpp/xpd.h (original)
+++ branches/1.2/xpp/xpd.h Fri Mar  3 14:14:09 2006
@@ -41,20 +41,20 @@
 	module_param(name, type, 0600);		\
 	MODULE_PARM_DESC(name, desc)
 
-#if	LINUX_VERSION_CODE	< KERNEL_VERSION(2,6,12)
+#if	LINUX_VERSION_CODE	< KERNEL_VERSION(2,6,10)
 /*
  * Old 2.6 kernels had module_param_array() macro that receive the counter
  * by value.
  */
 #define	DEF_ARRAY(type,name,count,init,desc)	\
 	unsigned int name ## _num_values;	\
-	type name[count] = {[0 ... count-1] = init};			\
+	type name[count] = { [0 ... ((count)-1)] = (init) };			\
 	module_param_array(name, type, name ## _num_values, 0600);	\
 	MODULE_PARM_DESC(name, desc " ( 1-" __MODULE_STRING(count) ")")
 #else
 #define	DEF_ARRAY(type,name,count,init,desc)	\
 	unsigned int name ## _num_values;	\
-	type name[count] = {[0 ... count-1] = init};			\
+	type name[count] = {[0 ... ((count)-1)] = init};			\
 	module_param_array(name, type, &name ## _num_values, 0600);	\
 	MODULE_PARM_DESC(name, desc " ( 1-" __MODULE_STRING(count) ")")
 #endif

Modified: branches/1.2/xpp/xpp_usb.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/xpp/xpp_usb.c?rev=973&r1=972&r2=973&view=diff
==============================================================================
--- branches/1.2/xpp/xpp_usb.c (original)
+++ branches/1.2/xpp/xpp_usb.c Fri Mar  3 14:14:09 2006
@@ -363,7 +363,7 @@
 /* usb specific object needed to register this driver with the usb subsystem */
 static struct usb_driver xusb_driver = {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16)
-        .owner: THIS_MODULE,
+        .owner =	THIS_MODULE,
 #endif
 	.name =		"xpp_usb",
 	.probe =	xusb_probe,