Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / include / linux / pci_ids.h

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 27363bf2979185cf79657da13356d5b66f20c2fc..8acae4eeaa763373f6908c52189218c228e5f23d 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1471,6 +1471,8 @@
 #define PCI_DEVICE_ID_RICOH_RL5C476    0x0476
 #define PCI_DEVICE_ID_RICOH_RL5C478    0x0478
 #define PCI_DEVICE_ID_RICOH_R5C822     0x0822
+#define PCI_DEVICE_ID_RICOH_R5C832     0x0832
+#define PCI_DEVICE_ID_RICOH_R5C843     0x0843
 
 #define PCI_VENDOR_ID_DLINK            0x1186
 #define PCI_DEVICE_ID_DLINK_DGE510T    0x4c00
@@ -1736,6 +1738,11 @@
 
 #define PCI_VENDOR_ID_RADISYS          0x1331
 
+#define PCI_VENDOR_ID_MICRO_MEMORY             0x1332
+#define PCI_DEVICE_ID_MICRO_MEMORY_5415CN      0x5415
+#define PCI_DEVICE_ID_MICRO_MEMORY_5425CN      0x5425
+#define PCI_DEVICE_ID_MICRO_MEMORY_6155                0x6155
+
 #define PCI_VENDOR_ID_DOMEX            0x134a
 #define PCI_DEVICE_ID_DOMEX_DMX3191D   0x0001