diff options
-rw-r--r-- | drivers/net/tg3.c | 3 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index a52f52fbb477..32e3a3de4c6d 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -221,12 +221,9 @@ static DEFINE_PCI_DEVICE_TABLE(tg3_pci_tbl) = { | |||
221 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5901_2)}, | 221 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5901_2)}, |
222 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704S_2)}, | 222 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5704S_2)}, |
223 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705F)}, | 223 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5705F)}, |
224 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5720)}, | ||
225 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5721)}, | 224 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5721)}, |
226 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5722)}, | 225 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5722)}, |
227 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750)}, | ||
228 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751)}, | 226 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751)}, |
229 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5750M)}, | ||
230 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751M)}, | 227 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751M)}, |
231 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751F)}, | 228 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5751F)}, |
232 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752)}, | 229 | {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752)}, |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index ae66851870be..9ac60dabb6ff 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -2053,7 +2053,6 @@ | |||
2053 | #define PCI_DEVICE_ID_NX2_57711E 0x1650 | 2053 | #define PCI_DEVICE_ID_NX2_57711E 0x1650 |
2054 | #define PCI_DEVICE_ID_TIGON3_5705 0x1653 | 2054 | #define PCI_DEVICE_ID_TIGON3_5705 0x1653 |
2055 | #define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 | 2055 | #define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 |
2056 | #define PCI_DEVICE_ID_TIGON3_5720 0x1658 | ||
2057 | #define PCI_DEVICE_ID_TIGON3_5721 0x1659 | 2056 | #define PCI_DEVICE_ID_TIGON3_5721 0x1659 |
2058 | #define PCI_DEVICE_ID_TIGON3_5722 0x165a | 2057 | #define PCI_DEVICE_ID_TIGON3_5722 0x165a |
2059 | #define PCI_DEVICE_ID_TIGON3_5723 0x165b | 2058 | #define PCI_DEVICE_ID_TIGON3_5723 0x165b |
@@ -2067,13 +2066,11 @@ | |||
2067 | #define PCI_DEVICE_ID_TIGON3_5754M 0x1672 | 2066 | #define PCI_DEVICE_ID_TIGON3_5754M 0x1672 |
2068 | #define PCI_DEVICE_ID_TIGON3_5755M 0x1673 | 2067 | #define PCI_DEVICE_ID_TIGON3_5755M 0x1673 |
2069 | #define PCI_DEVICE_ID_TIGON3_5756 0x1674 | 2068 | #define PCI_DEVICE_ID_TIGON3_5756 0x1674 |
2070 | #define PCI_DEVICE_ID_TIGON3_5750 0x1676 | ||
2071 | #define PCI_DEVICE_ID_TIGON3_5751 0x1677 | 2069 | #define PCI_DEVICE_ID_TIGON3_5751 0x1677 |
2072 | #define PCI_DEVICE_ID_TIGON3_5715 0x1678 | 2070 | #define PCI_DEVICE_ID_TIGON3_5715 0x1678 |
2073 | #define PCI_DEVICE_ID_TIGON3_5715S 0x1679 | 2071 | #define PCI_DEVICE_ID_TIGON3_5715S 0x1679 |
2074 | #define PCI_DEVICE_ID_TIGON3_5754 0x167a | 2072 | #define PCI_DEVICE_ID_TIGON3_5754 0x167a |
2075 | #define PCI_DEVICE_ID_TIGON3_5755 0x167b | 2073 | #define PCI_DEVICE_ID_TIGON3_5755 0x167b |
2076 | #define PCI_DEVICE_ID_TIGON3_5750M 0x167c | ||
2077 | #define PCI_DEVICE_ID_TIGON3_5751M 0x167d | 2074 | #define PCI_DEVICE_ID_TIGON3_5751M 0x167d |
2078 | #define PCI_DEVICE_ID_TIGON3_5751F 0x167e | 2075 | #define PCI_DEVICE_ID_TIGON3_5751F 0x167e |
2079 | #define PCI_DEVICE_ID_TIGON3_5787F 0x167f | 2076 | #define PCI_DEVICE_ID_TIGON3_5787F 0x167f |