Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

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

diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c
index 42d6823b82b3d4efac2658bba02302c48f9baff1..8472543eee81d4f117103836d6636b25abbc98e0 100644 (file)
--- a/drivers/usb/atm/xusbatm.c
+++ b/drivers/usb/atm/xusbatm.c
@@ -20,7 +20,6 @@
  ******************************************************************************/
 
 #include <linux/module.h>
-#include <linux/netdevice.h>           /* FIXME: required by linux/etherdevice.h */
 #include <linux/etherdevice.h>         /* for random_ether_addr() */
 
 #include "usbatm.h"
@@ -30,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)