aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000_main.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000/e1000_main.c')
-rw-r--r--drivers/net/e1000/e1000_main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 5cc39ed289c6..3e8ac4baae1b 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -962,15 +962,15 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
962 e1000_get_bus_info(hw); 962 e1000_get_bus_info(hw);
963 963
964 init_timer(&adapter->tx_fifo_stall_timer); 964 init_timer(&adapter->tx_fifo_stall_timer);
965 adapter->tx_fifo_stall_timer.function = &e1000_82547_tx_fifo_stall; 965 adapter->tx_fifo_stall_timer.function = e1000_82547_tx_fifo_stall;
966 adapter->tx_fifo_stall_timer.data = (unsigned long)adapter; 966 adapter->tx_fifo_stall_timer.data = (unsigned long)adapter;
967 967
968 init_timer(&adapter->watchdog_timer); 968 init_timer(&adapter->watchdog_timer);
969 adapter->watchdog_timer.function = &e1000_watchdog; 969 adapter->watchdog_timer.function = e1000_watchdog;
970 adapter->watchdog_timer.data = (unsigned long) adapter; 970 adapter->watchdog_timer.data = (unsigned long) adapter;
971 971
972 init_timer(&adapter->phy_info_timer); 972 init_timer(&adapter->phy_info_timer);
973 adapter->phy_info_timer.function = &e1000_update_phy_info; 973 adapter->phy_info_timer.function = e1000_update_phy_info;
974 adapter->phy_info_timer.data = (unsigned long)adapter; 974 adapter->phy_info_timer.data = (unsigned long)adapter;
975 975
976 INIT_WORK(&adapter->reset_task, e1000_reset_task); 976 INIT_WORK(&adapter->reset_task, e1000_reset_task);