Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[pandora-kernel.git] / include / linux / pci_ids.h

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 33a5d1c..b4c3d1b 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -393,6 +393,9 @@
 #define PCI_DEVICE_ID_VLSI_82C147      0x0105
 #define PCI_DEVICE_ID_VLSI_VAS96011    0x0702
 
+/* AMD RD890 Chipset */
+#define PCI_DEVICE_ID_RD890_IOMMU      0x5a23
+
 #define PCI_VENDOR_ID_ADL              0x1005
 #define PCI_DEVICE_ID_ADL_2301         0x2301
 
@@ -514,6 +517,7 @@
 #define PCI_DEVICE_ID_AMD_11H_NB_DRAM  0x1302
 #define PCI_DEVICE_ID_AMD_11H_NB_MISC  0x1303
 #define PCI_DEVICE_ID_AMD_11H_NB_LINK  0x1304
+#define PCI_DEVICE_ID_AMD_15H_NB_MISC  0x1603
 #define PCI_DEVICE_ID_AMD_LANCE                0x2000
 #define PCI_DEVICE_ID_AMD_LANCE_HOME   0x2001
 #define PCI_DEVICE_ID_AMD_SCSI         0x2020
@@ -739,6 +743,7 @@
 #define PCI_DEVICE_ID_HP_CISSC         0x3230
 #define PCI_DEVICE_ID_HP_CISSD         0x3238
 #define PCI_DEVICE_ID_HP_CISSE         0x323a
+#define PCI_DEVICE_ID_HP_CISSF         0x323b
 #define PCI_DEVICE_ID_HP_ZX2_IOC       0x4031
 
 #define PCI_VENDOR_ID_PCTECH           0x1042
@@ -815,7 +820,7 @@
 
 #define PCI_VENDOR_ID_ANIGMA           0x1051
 #define PCI_DEVICE_ID_ANIGMA_MC145575  0x0100
-  
+
 #define PCI_VENDOR_ID_EFAR             0x1055
 #define PCI_DEVICE_ID_EFAR_SLC90E66_1  0x9130
 #define PCI_DEVICE_ID_EFAR_SLC90E66_3  0x9463
@@ -1446,7 +1451,7 @@
 
 #define PCI_VENDOR_ID_ZIATECH          0x1138
 #define PCI_DEVICE_ID_ZIATECH_5550_HC  0x5550
- 
+
 
 #define PCI_VENDOR_ID_SYSKONNECT       0x1148
 #define PCI_DEVICE_ID_SYSKONNECT_TR    0x4200
@@ -1600,8 +1605,8 @@
 #define PCI_DEVICE_ID_RP8OCTA          0x0005
 #define PCI_DEVICE_ID_RP8J             0x0006
 #define PCI_DEVICE_ID_RP4J             0x0007
-#define PCI_DEVICE_ID_RP8SNI           0x0008  
-#define PCI_DEVICE_ID_RP16SNI          0x0009  
+#define PCI_DEVICE_ID_RP8SNI           0x0008
+#define PCI_DEVICE_ID_RP16SNI          0x0009
 #define PCI_DEVICE_ID_RPP4             0x000A
 #define PCI_DEVICE_ID_RPP8             0x000B
 #define PCI_DEVICE_ID_RP4M             0x000D
@@ -1611,9 +1616,9 @@
 #define PCI_DEVICE_ID_URP8INTF         0x0802
 #define PCI_DEVICE_ID_URP16INTF                0x0803
 #define PCI_DEVICE_ID_URP8OCTA         0x0805
-#define PCI_DEVICE_ID_UPCI_RM3_8PORT   0x080C       
+#define PCI_DEVICE_ID_UPCI_RM3_8PORT   0x080C
 #define PCI_DEVICE_ID_UPCI_RM3_4PORT   0x080D
-#define PCI_DEVICE_ID_CRP16INTF                0x0903       
+#define PCI_DEVICE_ID_CRP16INTF                0x0903
 
 #define PCI_VENDOR_ID_CYCLADES         0x120e
 #define PCI_DEVICE_ID_CYCLOM_Y_Lo      0x0100
@@ -2139,7 +2144,7 @@
 #define PCI_DEVICE_ID_RASTEL_2PORT     0x2000
 
 #define PCI_VENDOR_ID_ZOLTRIX          0x15b0
-#define PCI_DEVICE_ID_ZOLTRIX_2BD0     0x2bd0 
+#define PCI_DEVICE_ID_ZOLTRIX_2BD0     0x2bd0
 
 #define PCI_VENDOR_ID_MELLANOX         0x15b3
 #define PCI_DEVICE_ID_MELLANOX_TAVOR   0x5a44
@@ -2189,6 +2194,9 @@
 #define PCI_VENDOR_ID_ARIMA            0x161f
 
 #define PCI_VENDOR_ID_BROCADE          0x1657
+#define PCI_DEVICE_ID_BROCADE_CT       0x0014
+#define PCI_DEVICE_ID_BROCADE_FC_8G1P  0x0017
+#define PCI_DEVICE_ID_BROCADE_CT_FC    0x0021
 
 #define PCI_VENDOR_ID_SIBYTE           0x166d
 #define PCI_DEVICE_ID_BCM1250_PCI      0x0001
@@ -2307,6 +2315,8 @@
 #define PCI_DEVICE_ID_P2010            0x0079
 #define PCI_DEVICE_ID_P1020E           0x0100
 #define PCI_DEVICE_ID_P1020            0x0101
+#define PCI_DEVICE_ID_P1021E           0x0102
+#define PCI_DEVICE_ID_P1021            0x0103
 #define PCI_DEVICE_ID_P1011E           0x0108
 #define PCI_DEVICE_ID_P1011            0x0109
 #define PCI_DEVICE_ID_P1022E           0x0110
@@ -2317,6 +2327,14 @@
 #define PCI_DEVICE_ID_P4080            0x0401
 #define PCI_DEVICE_ID_P4040E           0x0408
 #define PCI_DEVICE_ID_P4040            0x0409
+#define PCI_DEVICE_ID_P2040E           0x0410
+#define PCI_DEVICE_ID_P2040            0x0411
+#define PCI_DEVICE_ID_P3041E           0x041E
+#define PCI_DEVICE_ID_P3041            0x041F
+#define PCI_DEVICE_ID_P5020E           0x0420
+#define PCI_DEVICE_ID_P5020            0x0421
+#define PCI_DEVICE_ID_P5010E           0x0428
+#define PCI_DEVICE_ID_P5010            0x0429
 #define PCI_DEVICE_ID_MPC8641          0x7010
 #define PCI_DEVICE_ID_MPC8641D         0x7011
 #define PCI_DEVICE_ID_MPC8610          0x7018
@@ -2420,7 +2438,7 @@
 #define PCI_DEVICE_ID_INTEL_82815_MC   0x1130
 #define PCI_DEVICE_ID_INTEL_82815_CGC  0x1132
 #define PCI_DEVICE_ID_INTEL_82092AA_0  0x1221
-#define PCI_DEVICE_ID_INTEL_7505_0     0x2550  
+#define PCI_DEVICE_ID_INTEL_7505_0     0x2550
 #define PCI_DEVICE_ID_INTEL_7205_0     0x255d
 #define PCI_DEVICE_ID_INTEL_82437      0x122d
 #define PCI_DEVICE_ID_INTEL_82371FB_0  0x122e
@@ -2623,6 +2641,9 @@
 #define PCI_DEVICE_ID_INTEL_MCH_PC     0x3599
 #define PCI_DEVICE_ID_INTEL_MCH_PC1    0x359a
 #define PCI_DEVICE_ID_INTEL_E7525_MCH  0x359e
+#define PCI_DEVICE_ID_INTEL_I7300_MCH_ERR 0x360c
+#define PCI_DEVICE_ID_INTEL_I7300_MCH_FB0 0x360f
+#define PCI_DEVICE_ID_INTEL_I7300_MCH_FB1 0x3610
 #define PCI_DEVICE_ID_INTEL_IOAT_CNB   0x360b
 #define PCI_DEVICE_ID_INTEL_FBD_CNB    0x360c
 #define PCI_DEVICE_ID_INTEL_IOAT_JSF0  0x3710