diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-03-03 19:37:48 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-03-03 19:37:48 +0000 |
| commit | 67d950ad487f28bd4e5bb8f6fc6211f38399f1d8 (patch) | |
| tree | f62368087dae0b725402983ac13a93effda1f585 /xpp | |
| parent | 73feebed1df365832188837eeb09220579da2fef (diff) | |
small compilation issues
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@972 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp')
| -rw-r--r-- | xpp/xpd.h | 6 | ||||
| -rw-r--r-- | xpp/xpp_usb.c | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -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 diff --git a/xpp/xpp_usb.c b/xpp/xpp_usb.c index 5caccb4..629789a 100644 --- a/xpp/xpp_usb.c +++ b/xpp/xpp_usb.c @@ -363,7 +363,7 @@ MODULE_DEVICE_TABLE (usb, xusb_table); /* 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, |