From 5ffd2ebdf1cb0544f875eeeeb7de7a83db37c921 Mon Sep 17 00:00:00 2001 From: david decotigny Date: Wed, 16 Nov 2011 12:15:15 +0000 Subject: [PATCH] --- yaml --- r: 277593 b: refs/heads/master c: 8f5f69824fe221a36df781c2aee9fa1d74e89077 h: refs/heads/master i: 277591: 9eeac57ba41b53b9f20d0b67470a1fd4093bf027 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/nvidia/forcedeth.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 53d84850b404..3a06cd080532 100644 --- 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 index b34975dca5df..0d8d5c0ab336 100644 --- 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 */