Merge branch 'remotes/lorenzo/pci/misc'

[linux.git] / include / linux / pci_ids.h

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 70e86148cb1e9436306fe821b41d5bc28933c39d..f3130542c752a8ed8cdc03a89a0bc5bfaa8c15d9 100644 (file)
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1112,7 +1112,7 @@
 
 #define PCI_VENDOR_ID_AL               0x10b9
 #define PCI_DEVICE_ID_AL_M1533         0x1533
-#define PCI_DEVICE_ID_AL_M1535                 0x1535
+#define PCI_DEVICE_ID_AL_M1535         0x1535
 #define PCI_DEVICE_ID_AL_M1541         0x1541
 #define PCI_DEVICE_ID_AL_M1563         0x1563
 #define PCI_DEVICE_ID_AL_M1621         0x1621
@@ -1336,6 +1336,7 @@
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP78S_SMBUS    0x0752
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE       0x0759
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_SMBUS     0x07D8
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE_320M           0x08A0
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS     0x0AA2
 #define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA     0x0D85
 
@@ -1752,7 +1753,7 @@
 #define PCI_VENDOR_ID_STALLION         0x124d
 
 /* Allied Telesyn */
-#define PCI_VENDOR_ID_AT               0x1259
+#define PCI_VENDOR_ID_AT               0x1259
 #define PCI_SUBDEVICE_ID_AT_2700FX     0x2701
 #define PCI_SUBDEVICE_ID_AT_2701FX     0x2703
 
@@ -2131,6 +2132,7 @@
 #define PCI_VENDOR_ID_MYRICOM          0x14c1
 
 #define PCI_VENDOR_ID_MEDIATEK         0x14c3
+#define PCI_DEVICE_ID_MEDIATEK_7629    0x7629
 
 #define PCI_VENDOR_ID_TITAN            0x14D2
 #define PCI_DEVICE_ID_TITAN_010L       0x8001
@@ -2366,6 +2368,7 @@
 #define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3                0xabcd
 #define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3_AXI    0xabce
 #define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB31       0xabcf
+#define PCI_DEVICE_ID_SYNOPSYS_EDDA    0xedda
 
 #define PCI_VENDOR_ID_USR              0x16ec
 
@@ -2550,7 +2553,7 @@
 #define PCI_DEVICE_ID_KORENIX_JETCARDF2        0x1700
 #define PCI_DEVICE_ID_KORENIX_JETCARDF3        0x17ff
 
-#define PCI_VENDOR_ID_HUAWEI           0x19e5
+#define PCI_VENDOR_ID_HUAWEI           0x19e5
 
 #define PCI_VENDOR_ID_NETRONOME                0x19ee
 #define PCI_DEVICE_ID_NETRONOME_NFP4000        0x4000
@@ -2568,6 +2571,8 @@
 
 #define PCI_VENDOR_ID_ASMEDIA          0x1b21
 
+#define PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS    0x1c36
+
 #define PCI_VENDOR_ID_CIRCUITCO                0x1cc8
 #define PCI_SUBSYSTEM_ID_CIRCUITCO_MINNOWBOARD 0x0001