Merge commit 'v2.6.27-rc7' into x86/pebs

[linux-2.6-omap-h63xx.git] / drivers / usb / atm / xusbatm.c

diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c
index 70125c6d3be49d12fa9ae47947b65ab2cadcae0f..8472543eee81d4f117103836d6636b25abbc98e0 100644 (file)
--- a/drivers/usb/atm/xusbatm.c
+++ b/drivers/usb/atm/xusbatm.c
@@ -29,7 +29,7 @@
 
 #define XUSBATM_PARM(name, type, parmtype, desc) \
        static type name[XUSBATM_DRIVERS_MAX]; \
-       static int num_##name; \
+       static unsigned int num_##name; \
        module_param_array(name, parmtype, &num_##name, 0444); \
        MODULE_PARM_DESC(name, desc)