Merge branch 'linus' into core/futexes

[pandora-kernel.git] / drivers / net / atl1e / atl1e_param.c

diff --git a/drivers/net/atl1e/atl1e_param.c b/drivers/net/atl1e/atl1e_param.c
index f72abb3..b3be59f 100644 (file)
--- a/drivers/net/atl1e/atl1e_param.c
+++ b/drivers/net/atl1e/atl1e_param.c
@@ -41,7 +41,7 @@
 
 #define ATL1E_PARAM(x, desc) \
        static int __devinitdata x[ATL1E_MAX_NIC + 1] = ATL1E_PARAM_INIT; \
-       static int num_##x; \
+       static unsigned int num_##x; \
        module_param_array_named(x, x, int, &num_##x, 0); \
        MODULE_PARM_DESC(x, desc);