Merge branch 'for-linus' of git://neil.brown.name/md

[~andy/linux] / include / linux / pci_ids.h

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ab47732d81e0fd302260e8602f3ea7cda979ecd8..ae0dc453e3e27565df1636e6b08f2c57707cb8e7 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2369,8 +2369,10 @@
 #define PCI_DEVICE_ID_JMICRON_JMB38X_SD        0x2381
 #define PCI_DEVICE_ID_JMICRON_JMB38X_MMC 0x2382
 #define PCI_DEVICE_ID_JMICRON_JMB38X_MS        0x2383
+#define PCI_DEVICE_ID_JMICRON_JMB385_MS        0x2388
 #define PCI_DEVICE_ID_JMICRON_JMB388_SD        0x2391
 #define PCI_DEVICE_ID_JMICRON_JMB388_ESD 0x2392
+#define PCI_DEVICE_ID_JMICRON_JMB390_MS        0x2393
 
 #define PCI_VENDOR_ID_KORENIX          0x1982
 #define PCI_DEVICE_ID_KORENIX_JETCARDF0        0x1600