]> err.no Git - linux-2.6/commitdiff
Revert "[PATCH] pci_ids.h: remove duplicate entries"
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 30 Nov 2005 18:22:30 +0000 (10:22 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 30 Nov 2005 18:22:30 +0000 (10:22 -0800)
This reverts commit c9d6073fb3cda856132dd544d537679f9715436c.

It was totally bogus.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/linux/pci_ids.h

index 53e3293051d4b0c31674d6329511a2b0303b2dab..1e737e269db99fbf01a5436910ae1aef99e9e075 100644 (file)
 #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
 #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