diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-21 15:14:18 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-21 15:14:18 -0600 |
| commit | d9520971589b008faa8df31aa2bb3d1e4f1c4534 (patch) | |
| tree | 5bbb628245575e29e7b30c72e8c5bb26187225bd /drivers/pci/dwc/pci-imx6.c | |
| parent | b2e6d3055d5545b97533d4e8376fa848639d9951 (diff) | |
| parent | 3fb5561879d71b5b80ddb48b3e7e5fa18c696d2a (diff) | |
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 'drivers/pci/dwc/pci-imx6.c')
0 files changed, 0 insertions, 0 deletions