diff --git a/[refs] b/[refs] index 33697a18ebbc..aa18e719addf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec8c0446b6e2b67b5c8813eb517f4bf00efa99a9 +refs/heads/master: aef6fba4f97bbec1dc5a253f388be9a4c7a30e41 diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 51180dba9a98..95c1e74afebc 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -2067,6 +2067,10 @@ #define PCI_DEVICE_ID_JMICRON_JMB366 0x2366 #define PCI_DEVICE_ID_JMICRON_JMB368 0x2368 +#define PCI_VENDOR_ID_KORENIX 0x1982 +#define PCI_DEVICE_ID_KORENIX_JETCARDF0 0x1600 +#define PCI_DEVICE_ID_KORENIX_JETCARDF1 0x16ff + #define PCI_VENDOR_ID_TEKRAM 0x1de1 #define PCI_DEVICE_ID_TEKRAM_DC290 0xdc29