diff --git a/[refs] b/[refs] index ae2ef55339d3..32d44ed13b69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fbf978914e8fbc804ddbd68550bb2c7d14b2049d +refs/heads/master: 5d7dce76c51a590fdd7616285a96825aa517ede0 diff --git a/trunk/drivers/net/ns83820.c b/trunk/drivers/net/ns83820.c index e80294d8cc19..9266502b5588 100644 --- a/trunk/drivers/net/ns83820.c +++ b/trunk/drivers/net/ns83820.c @@ -409,7 +409,7 @@ static int lnksts = 0; /* CFG_LNKSTS bit polarity */ struct rx_info { spinlock_t lock; int up; - long idle; + unsigned long idle; struct sk_buff *skbs[NR_RX_DESC];