Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[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..17d167bbd2dc346fefdead23ab4c3ddef68eca25 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)
 
@@ -193,7 +193,7 @@ static int __init xusbatm_init(void)
            num_vendor != num_product ||
            num_vendor != num_rx_endpoint ||
            num_vendor != num_tx_endpoint) {
-               warn("malformed module parameters");
+               printk(KERN_WARNING "xusbatm: malformed module parameters\n");
                return -EINVAL;
        }