diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-22 00:14:18 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-22 00:14:18 +0300 |
| commit | d9520971589b008faa8df31aa2bb3d1e4f1c4534 (patch) | |
| tree | 5bbb628245575e29e7b30c72e8c5bb26187225bd /include | |
| parent | b2e6d3055d5545b97533d4e8376fa848639d9951 (diff) | |
| parent | 3fb5561879d71b5b80ddb48b3e7e5fa18c696d2a (diff) | |
| download | linux-d9520971589b008faa8df31aa2bb3d1e4f1c4534.tar.xz | |
Merge branch 'pci/host-hisi' into next
* pci/host-hisi:
PCI: generic: Call pci_fixup_irqs() only on ARM
PCI: Disable MSI for HiSilicon Hip06/Hip07 Root Ports
PCI: hisi: Rename config space accessors to remove "acpi"
PCI: hisi: Add DT almost-ECAM support for Hip06/Hip07 host controllers
PCI: hisi: Use of_device_get_match_data() to simplify probe
Conflicts:
drivers/pci/dwc/pcie-hisi.c
Diffstat (limited to 'include')
| -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 73dda0edcb97..a4f77feecbb0 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -2516,6 +2516,8 @@ #define PCI_DEVICE_ID_KORENIX_JETCARDF2 0x1700 #define PCI_DEVICE_ID_KORENIX_JETCARDF3 0x17ff +#define PCI_VENDOR_ID_HUAWEI 0x19e5 + #define PCI_VENDOR_ID_NETRONOME 0x19ee #define PCI_DEVICE_ID_NETRONOME_NFP3200 0x3200 #define PCI_DEVICE_ID_NETRONOME_NFP3240 0x3240 |