diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:37 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-06 16:10:37 -0500 |
| commit | cc64520f970a0b9a2d94c815d9bf5fd5c88f213d (patch) | |
| tree | bb8e9f2daed41093f32448716205230dbf95d6fb /include/linux/pci_ids.h | |
| parent | 741f8e7ecc2c6414cff442ec8eb07dcfe4481533 (diff) | |
| parent | 42fe2f91b4ebc07c815fb334ea1262e6dc23bf77 (diff) | |
| download | linux-cc64520f970a0b9a2d94c815d9bf5fd5c88f213d.tar.gz linux-cc64520f970a0b9a2d94c815d9bf5fd5c88f213d.tar.bz2 linux-cc64520f970a0b9a2d94c815d9bf5fd5c88f213d.zip | |
Merge branch 'lorenzo/pci/mediatek'
- implement Mediatek chained IRQ handling (Honghui Zhang)
- fix vendor ID & class type for Mediatek MT7622 (Honghui Zhang)
* lorenzo/pci/mediatek:
PCI: mediatek: Implement chained IRQ handling setup
PCI: mediatek: Set up vendor ID and class type for MT7622
# Conflicts:
# drivers/pci/host/Kconfig
Diffstat (limited to 'include/linux/pci_ids.h')
| -rw-r--r-- | include/linux/pci_ids.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 2609f7e11d06..6e0e0aacdd3e 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2120,6 +2120,8 @@ #define PCI_VENDOR_ID_MYRICOM 0x14c1 +#define PCI_VENDOR_ID_MEDIATEK 0x14c3 + #define PCI_VENDOR_ID_TITAN 0x14D2 #define PCI_DEVICE_ID_TITAN_010L 0x8001 #define PCI_DEVICE_ID_TITAN_100L 0x8010 |