Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[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 2bcb02d555e833489bfa36458ff8aa9f9ef1b6b4..2c49561f9b459e155907a89397b239326fb3aa64 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -829,6 +829,9 @@
 #define PCI_DEVICE_ID_UMC_UM8886BF     0x673a
 #define PCI_DEVICE_ID_UMC_UM8886A      0x886a
 
+#define PCI_VENDOR_ID_PICOPOWER                0x1066
+#define PCI_DEVICE_ID_PICOPOWER_PT86C523       0x0002
+#define PCI_DEVICE_ID_PICOPOWER_PT86C523BBP    0x8002
 
 #define PCI_VENDOR_ID_MYLEX            0x1069
 #define PCI_DEVICE_ID_MYLEX_DAC960_P   0x0001
@@ -1464,6 +1467,8 @@
 #define PCI_DEVICE_ID_TOSHIBA_TC86C001_MISC    0x0108
 #define PCI_DEVICE_ID_TOSHIBA_SPIDER_NET 0x01b3
 
+#define PCI_VENDOR_ID_ATTO             0x117c
+
 #define PCI_VENDOR_ID_RICOH            0x1180
 #define PCI_DEVICE_ID_RICOH_RL5C465    0x0465
 #define PCI_DEVICE_ID_RICOH_RL5C466    0x0466
@@ -2073,6 +2078,9 @@
 #define PCI_DEVICE_ID_ARECA_1130       0x1130
 #define PCI_DEVICE_ID_ARECA_1160       0x1160
 #define PCI_DEVICE_ID_ARECA_1170       0x1170
+#define PCI_DEVICE_ID_ARECA_1200       0x1200
+#define PCI_DEVICE_ID_ARECA_1201       0x1201
+#define PCI_DEVICE_ID_ARECA_1202       0x1202
 #define PCI_DEVICE_ID_ARECA_1210       0x1210
 #define PCI_DEVICE_ID_ARECA_1220       0x1220
 #define PCI_DEVICE_ID_ARECA_1230       0x1230
@@ -2243,6 +2251,7 @@
 #define PCI_DEVICE_ID_INTEL_82801EB_5  0x24d5
 #define PCI_DEVICE_ID_INTEL_82801EB_6  0x24d6
 #define PCI_DEVICE_ID_INTEL_82801EB_11 0x24db
+#define PCI_DEVICE_ID_INTEL_82801EB_12 0x24dc
 #define PCI_DEVICE_ID_INTEL_82801EB_13 0x24dd
 #define PCI_DEVICE_ID_INTEL_ESB_1      0x25a1
 #define PCI_DEVICE_ID_INTEL_ESB_2      0x25a2