From 6f1a7bccfa2027fef693773162b95f14043d3546 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 30 Nov 2005 10:22:30 -0800 Subject: [PATCH] --- yaml --- r: 14829 b: refs/heads/master c: 346f7dbb17cb7d84317b4410df2e8f7bf2e57f44 h: refs/heads/master i: 14827: b164e6cb4bd1287b16626a89c03958e7c3ec2388 v: v3 --- [refs] | 2 +- trunk/include/linux/pci_ids.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 35a206351039..192e0bb712b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a145dd411eb28c83ee4bb68b66f62c326c0f764e +refs/heads/master: 346f7dbb17cb7d84317b4410df2e8f7bf2e57f44 diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 53e3293051d4..1e737e269db9 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/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