diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 23:10:18 +0200 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 23:10:18 +0200 |
commit | b83e445d462a858d51f04fdb3db0cd307bfabd1f (patch) | |
tree | 0b685f23958e371ef0b4eccfd72ef11be822d34e /drivers/pci/pcie/aer_inject.c | |
parent | Merge branch 'remotes/lorenzo/pci/al' (diff) | |
parent | arm64: dts: fsl: Remove num-lanes property from PCIe nodes (diff) | |
download | linux-b83e445d462a858d51f04fdb3db0cd307bfabd1f.tar.xz linux-b83e445d462a858d51f04fdb3db0cd307bfabd1f.zip |
Merge branch 'remotes/lorenzo/pci/dwc'
- Make kirin_dw_pcie_ops constant (Nishka Dasgupta)
- Make DesignWare "num-lanes" property optional and remove from relevant
DTs (Hou Zhiqiang)
* remotes/lorenzo/pci/dwc:
arm64: dts: fsl: Remove num-lanes property from PCIe nodes
ARM: dts: ls1021a: Remove num-lanes property from PCIe nodes
PCI: dwc: Return directly when num-lanes is not found
dt-bindings: PCI: designware: Remove the num-lanes from Required properties
PCI: kirin: Make structure kirin_dw_pcie_ops constant
Diffstat (limited to 'drivers/pci/pcie/aer_inject.c')
0 files changed, 0 insertions, 0 deletions