Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

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

diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 66898463b81f0d69de2b2050feb60daa495bb21d..c842735a4f45a41d4ce305d236d08a8b2d0ef3b6 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
@@ -1753,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
 
@@ -2367,6 +2367,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
 
@@ -2551,7 +2552,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