aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/igb_main.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2009-02-06 18:17:47 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-07 05:43:06 -0500
commit312c75aee7606e886d91c810bc491c9f40ff5837 (patch)
treeb8ab05276b686849a5916f93a63d8e44ce800f1e /drivers/net/igb/igb_main.c
parenta8d2a0c27f84bdbf54b7e1c1a52ef7b8b7196dbc (diff)
igb: rename nvm ops
All of the nvm ops have the tag _nvm added to the end which is redundant since all of the calls to the ops have to go through the nvm ops struct anyway. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-rw-r--r--drivers/net/igb/igb_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index cb3ac349f3b..e3a3582fec9 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1243,8 +1243,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
1243 1243
1244 if (hw->bus.func == 0 || 1244 if (hw->bus.func == 0 ||
1245 hw->device_id == E1000_DEV_ID_82575EB_COPPER) 1245 hw->device_id == E1000_DEV_ID_82575EB_COPPER)
1246 hw->nvm.ops.read_nvm(hw, NVM_INIT_CONTROL3_PORT_A, 1, 1246 hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data);
1247 &eeprom_data);
1248 1247
1249 if (eeprom_data & eeprom_apme_mask) 1248 if (eeprom_data & eeprom_apme_mask)
1250 adapter->eeprom_wol |= E1000_WUFC_MAG; 1249 adapter->eeprom_wol |= E1000_WUFC_MAG;