You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
2.1 KiB
Diff
48 lines
2.1 KiB
Diff
commit 812bcf8f47b45a206948008144233bc47d5747ac
|
|
Author: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Thu Dec 16 20:01:17 2010 +0100
|
|
|
|
Revert "tg3: Remove 5720, 5750, and 5750M"
|
|
|
|
This reverts commit 67b284d476bcb3d100e946da23d6cf9acfd0465c.
|
|
|
|
--- a/drivers/net/ethernet/broadcom/tg3.c
|
|
+++ b/drivers/net/ethernet/broadcom/tg3.c
|
|
@@ -248,9 +248,12 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_pci_t
|
|
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5901_2)},
|
|
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704S_2)},
|
|
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705F)},
|
|
+ {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5720)},
|
|
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5721)},
|
|
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5722)},
|
|
+ {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750)},
|
|
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751)},
|
|
+ {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750M)},
|
|
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751M)},
|
|
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751F)},
|
|
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752)},
|
|
--- a/include/linux/pci_ids.h
|
|
+++ b/include/linux/pci_ids.h
|
|
@@ -2082,6 +2082,7 @@
|
|
#define PCI_DEVICE_ID_NX2_57711E 0x1650
|
|
#define PCI_DEVICE_ID_TIGON3_5705 0x1653
|
|
#define PCI_DEVICE_ID_TIGON3_5705_2 0x1654
|
|
+#define PCI_DEVICE_ID_TIGON3_5720 0x1658
|
|
#define PCI_DEVICE_ID_TIGON3_5721 0x1659
|
|
#define PCI_DEVICE_ID_TIGON3_5722 0x165a
|
|
#define PCI_DEVICE_ID_TIGON3_5723 0x165b
|
|
@@ -2097,11 +2098,13 @@
|
|
#define PCI_DEVICE_ID_TIGON3_5754M 0x1672
|
|
#define PCI_DEVICE_ID_TIGON3_5755M 0x1673
|
|
#define PCI_DEVICE_ID_TIGON3_5756 0x1674
|
|
+#define PCI_DEVICE_ID_TIGON3_5750 0x1676
|
|
#define PCI_DEVICE_ID_TIGON3_5751 0x1677
|
|
#define PCI_DEVICE_ID_TIGON3_5715 0x1678
|
|
#define PCI_DEVICE_ID_TIGON3_5715S 0x1679
|
|
#define PCI_DEVICE_ID_TIGON3_5754 0x167a
|
|
#define PCI_DEVICE_ID_TIGON3_5755 0x167b
|
|
+#define PCI_DEVICE_ID_TIGON3_5750M 0x167c
|
|
#define PCI_DEVICE_ID_TIGON3_5751M 0x167d
|
|
#define PCI_DEVICE_ID_TIGON3_5751F 0x167e
|
|
#define PCI_DEVICE_ID_TIGON3_5787F 0x167f
|