diff options
-rw-r--r-- | drivers/net/tg3.c | 4 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index e6561c1d85d6..5514828b7929 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -192,6 +192,7 @@ static struct pci_device_id tg3_pci_tbl[] = { | |||
192 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5786)}, | 192 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5786)}, |
193 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787)}, | 193 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787)}, |
194 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787M)}, | 194 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787M)}, |
195 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5787F)}, | ||
195 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714)}, | 196 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714)}, |
196 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714S)}, | 197 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5714S)}, |
197 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5715)}, | 198 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5715)}, |
@@ -10859,7 +10860,8 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) | |||
10859 | tp->pdev->device == PCI_DEVICE_ID_TIGON3_5705F)) || | 10860 | tp->pdev->device == PCI_DEVICE_ID_TIGON3_5705F)) || |
10860 | (tp->pdev->vendor == PCI_VENDOR_ID_BROADCOM && | 10861 | (tp->pdev->vendor == PCI_VENDOR_ID_BROADCOM && |
10861 | (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5751F || | 10862 | (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5751F || |
10862 | tp->pdev->device == PCI_DEVICE_ID_TIGON3_5753F)) || | 10863 | tp->pdev->device == PCI_DEVICE_ID_TIGON3_5753F || |
10864 | tp->pdev->device == PCI_DEVICE_ID_TIGON3_5787F)) || | ||
10863 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) | 10865 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) |
10864 | tp->tg3_flags |= TG3_FLAG_10_100_ONLY; | 10866 | tp->tg3_flags |= TG3_FLAG_10_100_ONLY; |
10865 | 10867 | ||
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index c09da1e30c54..edddcce68b94 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -1931,6 +1931,7 @@ | |||
1931 | #define PCI_DEVICE_ID_TIGON3_5750M 0x167c | 1931 | #define PCI_DEVICE_ID_TIGON3_5750M 0x167c |
1932 | #define PCI_DEVICE_ID_TIGON3_5751M 0x167d | 1932 | #define PCI_DEVICE_ID_TIGON3_5751M 0x167d |
1933 | #define PCI_DEVICE_ID_TIGON3_5751F 0x167e | 1933 | #define PCI_DEVICE_ID_TIGON3_5751F 0x167e |
1934 | #define PCI_DEVICE_ID_TIGON3_5787F 0x167f | ||
1934 | #define PCI_DEVICE_ID_TIGON3_5787M 0x1693 | 1935 | #define PCI_DEVICE_ID_TIGON3_5787M 0x1693 |
1935 | #define PCI_DEVICE_ID_TIGON3_5782 0x1696 | 1936 | #define PCI_DEVICE_ID_TIGON3_5782 0x1696 |
1936 | #define PCI_DEVICE_ID_TIGON3_5786 0x169a | 1937 | #define PCI_DEVICE_ID_TIGON3_5786 0x169a |