From: Linus Torvalds Date: Wed, 30 Nov 2005 18:22:30 +0000 (-0800) Subject: Revert "[PATCH] pci_ids.h: remove duplicate entries" X-Git-Tag: v2.6.15-rc4~1^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=346f7dbb17cb7d84317b4410df2e8f7bf2e57f44;p=platform%2Fkernel%2Flinux-3.10.git Revert "[PATCH] pci_ids.h: remove duplicate entries" This reverts commit c9d6073fb3cda856132dd544d537679f9715436c. It was totally bogus. Signed-off-by: Linus Torvalds --- diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 53e3293..1e737e2 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