diff options
| author | Colin Cross <ccross@android.com> | 2011-10-27 15:01:19 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-10-27 15:01:19 -0700 |
| commit | 2bb3e310159b65c88caf0c67a20ed257568be267 (patch) | |
| tree | e4ad01c06a9e27939781c5dd9d0cb92e6fcd54d5 /drivers/net/igb/igb_main.c | |
| parent | 2f53cb72c1574d3880d9e88e254b756565fe2f6d (diff) | |
| parent | 97596c34030ed28657ccafddb67e17a03890b90a (diff) | |
| download | kernel_samsung_aries-2bb3e310159b65c88caf0c67a20ed257568be267.zip kernel_samsung_aries-2bb3e310159b65c88caf0c67a20ed257568be267.tar.gz kernel_samsung_aries-2bb3e310159b65c88caf0c67a20ed257568be267.tar.bz2 | |
Merge commit 'v3.0.8' into android-3.0
Diffstat (limited to 'drivers/net/igb/igb_main.c')
| -rw-r--r-- | drivers/net/igb/igb_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 2c28621..97f46ac 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -1985,7 +1985,7 @@ static int __devinit igb_probe(struct pci_dev *pdev, if (hw->bus.func == 0) hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A, 1, &eeprom_data); - else if (hw->mac.type == e1000_82580) + else if (hw->mac.type >= e1000_82580) hw->nvm.ops.read(hw, NVM_INIT_CONTROL3_PORT_A + NVM_82580_LAN_FUNC_OFFSET(hw->bus.func), 1, &eeprom_data); |