From 47784a03a755b034423f0397e177b6a028bcc37f Mon Sep 17 00:00:00 2001 From: Anders Wallin Date: Thu, 23 Sep 2010 19:39:04 +0200 Subject: [PATCH] --- yaml --- r: 219551 b: refs/heads/master c: 7473fbf4a016301bfa3faa4f81c9a9c978330359 h: refs/heads/master i: 219549: 3b6d5a38e1781bd3cceea3b565a15db063ae48c9 219547: 07b206e23d476b770cc97eaa03619b9383baa77f 219543: 8a6c46e25a27368b90200488fef667733b88ddfc 219535: 71ffa8202dbef5befb954db04a592c5121238712 219519: 6812e63ff1de85d83412aaf482080d4736bf95b4 v: v3 --- [refs] | 2 +- trunk/include/linux/pci_ids.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7f889c3dc3d2..f4cbe882e67c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25143fd1270d28782ae0620aa86ef5f8c14030fd +refs/heads/master: 7473fbf4a016301bfa3faa4f81c9a9c978330359 diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index b9ff2801cf76..ea5a3d19aaba 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -765,6 +765,8 @@ #define PCI_DEVICE_ID_ELSA_MICROLINK 0x1000 #define PCI_DEVICE_ID_ELSA_QS3000 0x3000 +#define PCI_VENDOR_ID_STMICRO 0x104A + #define PCI_VENDOR_ID_BUSLOGIC 0x104B #define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER_NC 0x0140 #define PCI_DEVICE_ID_BUSLOGIC_MULTIMASTER 0x1040