diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:00:48 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:00:48 -0500 |
| commit | b6f4098897f30b7ea90a1c1edf35e9b20a9d828a (patch) | |
| tree | 349c3db295d6f3d6895ff1e181842914379e53d8 /drivers/net/igb/e1000_82575.c | |
| parent | 23624935e0c4b04730ed8d7d21f0cd25b2c2cda1 (diff) | |
| parent | 6493d24f77d8e4fe94913eb504ed9ffebb433402 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/igb/e1000_82575.c')
| -rw-r--r-- | drivers/net/igb/e1000_82575.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index 0a2368fa6bc6..c1552b6f4a68 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c | |||
| @@ -129,6 +129,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) | |||
| 129 | break; | 129 | break; |
| 130 | case E1000_DEV_ID_82580_COPPER: | 130 | case E1000_DEV_ID_82580_COPPER: |
| 131 | case E1000_DEV_ID_82580_FIBER: | 131 | case E1000_DEV_ID_82580_FIBER: |
| 132 | case E1000_DEV_ID_82580_QUAD_FIBER: | ||
| 132 | case E1000_DEV_ID_82580_SERDES: | 133 | case E1000_DEV_ID_82580_SERDES: |
| 133 | case E1000_DEV_ID_82580_SGMII: | 134 | case E1000_DEV_ID_82580_SGMII: |
| 134 | case E1000_DEV_ID_82580_COPPER_DUAL: | 135 | case E1000_DEV_ID_82580_COPPER_DUAL: |