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