Ver código fonte

Revert "[PATCH] pci_ids.h: remove duplicate entries"

This reverts commit c9d6073fb3cda856132dd544d537679f9715436c.

It was totally bogus.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds 19 anos atrás
pai
commit
346f7dbb17
1 arquivos alterados com 3 adições e 0 exclusões
  1. 3 0
      include/linux/pci_ids.h

+ 3 - 0
include/linux/pci_ids.h

@@ -387,6 +387,7 @@
 #define PCI_DEVICE_ID_NS_SC1100_SMI	0x0511
 #define PCI_DEVICE_ID_NS_SC1100_SMI	0x0511
 #define PCI_DEVICE_ID_NS_SC1100_XBUS	0x0515
 #define PCI_DEVICE_ID_NS_SC1100_XBUS	0x0515
 #define PCI_DEVICE_ID_NS_87410		0xd001
 #define PCI_DEVICE_ID_NS_87410		0xd001
+#define PCI_DEVICE_ID_NS_CS5535_IDE	0x002d
 
 
 #define PCI_VENDOR_ID_TSENG		0x100c
 #define PCI_VENDOR_ID_TSENG		0x100c
 #define PCI_DEVICE_ID_TSENG_W32P_2	0x3202
 #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_8151_0	0x7454
 #define PCI_DEVICE_ID_AMD_8131_APIC     0x7450
 #define PCI_DEVICE_ID_AMD_8131_APIC     0x7450
 
 
+#define PCI_DEVICE_ID_AMD_CS5536_IDE	0x209A
+
 #define PCI_VENDOR_ID_TRIDENT		0x1023
 #define PCI_VENDOR_ID_TRIDENT		0x1023
 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX	0x2000
 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_DX	0x2000
 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX	0x2001
 #define PCI_DEVICE_ID_TRIDENT_4DWAVE_NX	0x2001