From 24db1d6326720ab56641be74e6fca56399302d86 Mon Sep 17 00:00:00 2001 From: Hannes Eder Date: Sat, 14 Feb 2009 11:14:58 +0000 Subject: [PATCH] --- yaml --- r: 134595 b: refs/heads/master c: fd8ef49edd81405e80e00eb81365ae4d6733d602 h: refs/heads/master i: 134593: fba230330e472d2092fb201c7f0024379c331000 134591: b95124dec4a87086f3bb298424a893b780f29992 v: v3 --- [refs] | 2 +- trunk/drivers/net/atl1e/atl1e.h | 2 +- trunk/drivers/net/atl1e/atl1e_param.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9678789db599..0876ad3a04e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 18c4c35ecbeda253ce7532a6ed7f2fa144147d64 +refs/heads/master: fd8ef49edd81405e80e00eb81365ae4d6733d602 diff --git a/trunk/drivers/net/atl1e/atl1e.h b/trunk/drivers/net/atl1e/atl1e.h index c49550d507a0..2bf63b4368e2 100644 --- a/trunk/drivers/net/atl1e/atl1e.h +++ b/trunk/drivers/net/atl1e/atl1e.h @@ -448,7 +448,7 @@ struct atl1e_adapter { /* All Descriptor memory */ dma_addr_t ring_dma; void *ring_vir_addr; - int ring_size; + u32 ring_size; struct atl1e_tx_ring tx_ring; struct atl1e_rx_ring rx_ring; diff --git a/trunk/drivers/net/atl1e/atl1e_param.c b/trunk/drivers/net/atl1e/atl1e_param.c index f72abb34b0cd..b3be59fd3fb5 100644 --- a/trunk/drivers/net/atl1e/atl1e_param.c +++ b/trunk/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);