summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-30 19:22:30 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-30 19:22:30 +0100
commit346f7dbb17cb7d84317b4410df2e8f7bf2e57f44 (patch)
tree3dff1774decbf6ad0d0d91ad5c1dc1ed735df8cd
parentVM: add "vm_insert_page()" function (diff)
downloadlinux-346f7dbb17cb7d84317b4410df2e8f7bf2e57f44.tar.xz
linux-346f7dbb17cb7d84317b4410df2e8f7bf2e57f44.zip
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.h3
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 @@
#define PCI_DEVICE_ID_NS_SC1100_SMI 0x0511
#define PCI_DEVICE_ID_NS_SC1100_XBUS 0x0515
#define PCI_DEVICE_ID_NS_87410 0xd001
+#define PCI_DEVICE_ID_NS_CS5535_IDE 0x002d
#define PCI_VENDOR_ID_TSENG 0x100c
#define PCI_DEVICE_ID_TSENG_W32P_2 0x3202
@@ -488,6 +489,8 @@
#define PCI_DEVICE_ID_AMD_8151_0 0x7454
#define PCI_DEVICE_ID_AMD_8131_APIC 0x7450
+#define PCI_DEVICE_ID_AMD_CS5536_IDE 0x209A
+
#define PCI_VENDOR_ID_TRIDENT 0x1023
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX 0x2000
#define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX 0x2001