---

yaml --- r: 277593 b: refs/heads/master c: 8f5f698 h: refs/heads/master i: 277591: 9eeac57 v: v3
git-mirror · Nov 17, 2011 · 5ffd2eb · 5ffd2eb
1 parent 82d6fcf
commit 5ffd2eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a1f222d24817bd57545dfb9573b5424db27d1d5
+refs/heads/master: 8f5f69824fe221a36df781c2aee9fa1d74e89077
diff --git a/trunk/drivers/net/ethernet/nvidia/forcedeth.c b/trunk/drivers/net/ethernet/nvidia/forcedeth.c
@@ -5532,7 +5532,7 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
 	init_timer(&np->nic_poll);
 	np->nic_poll.data = (unsigned long) dev;
 	np->nic_poll.function = nv_do_nic_poll;	/* timer handler */
-	init_timer(&np->stats_poll);
+	init_timer_deferrable(&np->stats_poll);
 	np->stats_poll.data = (unsigned long) dev;
 	np->stats_poll.function = nv_do_stats_poll;	/* timer handler */