diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-30 13:22:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-30 13:22:30 -0500 |
| commit | 346f7dbb17cb7d84317b4410df2e8f7bf2e57f44 (patch) | |
| tree | 3dff1774decbf6ad0d0d91ad5c1dc1ed735df8cd | |
| parent | a145dd411eb28c83ee4bb68b66f62c326c0f764e (diff) | |
Revert "[PATCH] pci_ids.h: remove duplicate entries"
This reverts commit c9d6073fb3cda856132dd544d537679f9715436c.
It was totally bogus.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/linux/pci_ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 53e3293051d4..1e737e269db9 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
| @@ -387,6 +387,7 @@ | |||
| 387 | #define PCI_DEVICE_ID_NS_SC1100_SMI 0x0511 | 387 | #define PCI_DEVICE_ID_NS_SC1100_SMI 0x0511 |
| 388 | #define PCI_DEVICE_ID_NS_SC1100_XBUS 0x0515 | 388 | #define PCI_DEVICE_ID_NS_SC1100_XBUS 0x0515 |
| 389 | #define PCI_DEVICE_ID_NS_87410 0xd001 | 389 | #define PCI_DEVICE_ID_NS_87410 0xd001 |
| 390 | #define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d | ||
| 390 | 391 | ||
| 391 | #define PCI_VENDOR_ID_TSENG 0x100c | 392 | #define PCI_VENDOR_ID_TSENG 0x100c |
| 392 | #define PCI_DEVICE_ID_TSENG_W32P_2 0x3202 | 393 | #define PCI_DEVICE_ID_TSENG_W32P_2 0x3202 |
| @@ -488,6 +489,8 @@ | |||
| 488 | #define PCI_DEVICE_ID_AMD_8151_0 0x7454 | 489 | #define PCI_DEVICE_ID_AMD_8151_0 0x7454 |
| 489 | #define PCI_DEVICE_ID_AMD_8131_APIC 0x7450 | 490 | #define PCI_DEVICE_ID_AMD_8131_APIC 0x7450 |
| 490 | 491 | ||
| 492 | #define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A | ||
| 493 | |||
| 491 | #define PCI_VENDOR_ID_TRIDENT 0x1023 | 494 | #define PCI_VENDOR_ID_TRIDENT 0x1023 |
| 492 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 | 495 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000 |
| 493 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001 | 496 | #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001 |