diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-07 10:48:27 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-07 10:48:27 +1000 |
| commit | 6d891a1c48e046119903e3df5407bb747692548e (patch) | |
| tree | e6adf3ec1baaa5ce416de5c258f3b5f2abb42a9f /drivers/net/ixgbevf/ixgbevf_main.c | |
| parent | 40f9aa93e528e01f194f2f2fa5e81b572a6f5f12 (diff) | |
| parent | 3e502e63586920f219ed2590f69c1f5a8888cfa4 (diff) | |
Merge remote branch 'net/master'
Diffstat (limited to 'drivers/net/ixgbevf/ixgbevf_main.c')
| -rw-r--r-- | drivers/net/ixgbevf/ixgbevf_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c index 918c00359b0a..5d3c869283a5 100644 --- a/drivers/net/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ixgbevf/ixgbevf_main.c @@ -3426,7 +3426,7 @@ static int __devinit ixgbevf_probe(struct pci_dev *pdev, } init_timer(&adapter->watchdog_timer); - adapter->watchdog_timer.function = &ixgbevf_watchdog; + adapter->watchdog_timer.function = ixgbevf_watchdog; adapter->watchdog_timer.data = (unsigned long)adapter; INIT_WORK(&adapter->reset_task, ixgbevf_reset_task); |