aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/atl1e/atl1e_param.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-27 17:19:16 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-27 17:19:16 -0700
commita83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch)
tree5b5c7c3a56898485479291b7c964a1f3887d469c /drivers/net/atl1e/atl1e_param.c
parentsparc64: Fix MM refcount check in smp_flush_tlb_pending(). (diff)
parenti915: fix wrong 'size_t' format string (diff)
downloadlinux-dev-a83398570e17af6bb81eb94f4f5dd356bd2828d8.tar.xz
linux-dev-a83398570e17af6bb81eb94f4f5dd356bd2828d8.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/net/atl1e/atl1e_param.c')
-rw-r--r--drivers/net/atl1e/atl1e_param.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atl1e/atl1e_param.c b/drivers/net/atl1e/atl1e_param.c
index f72abb34b0cd..b3be59fd3fb5 100644
--- 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);