diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:20 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:20 -0500 |
commit | 27e87395ae3497ebb63942150e43999c93a83ed0 (patch) | |
tree | 6b8694a556139117401653a5bea2ddff9470bcc9 /Documentation/devicetree/bindings/pci/hisilicon-pcie.txt | |
parent | Merge branch 'pci/resource' into next (diff) | |
parent | PCI: Fix typos and whitespace errors (diff) | |
download | linux-dev-27e87395ae3497ebb63942150e43999c93a83ed0.tar.xz linux-dev-27e87395ae3497ebb63942150e43999c93a83ed0.zip |
Merge branch 'pci/trivial' into next
* pci/trivial:
PCI: Fix typos and whitespace errors
PCI: Remove unused "res" variable from pci_resource_io()
PCI: Correct kernel-doc of pci_vpd_srdt_size(), pci_vpd_srdt_tag()
Diffstat (limited to 'Documentation/devicetree/bindings/pci/hisilicon-pcie.txt')
-rw-r--r-- | Documentation/devicetree/bindings/pci/hisilicon-pcie.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt b/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt index a339dbb15493..b0fd3ba66ec9 100644 --- a/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt +++ b/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt @@ -1,7 +1,7 @@ HiSilicon Hip05 and Hip06 PCIe host bridge DT description -HiSilicon PCIe host controller is based on Designware PCI core. -It shares common functions with PCIe Designware core driver and inherits +HiSilicon PCIe host controller is based on the Synopsys DesignWare PCI core. +It shares common functions with the PCIe DesignWare core driver and inherits common properties defined in Documentation/devicetree/bindings/pci/designware-pci.txt. |