diff options
author | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-12-09 22:09:55 -0500 |
commit | 51e18a453f5f59a40c721d4aeab082b4e2e9fac6 (patch) | |
tree | 540d37e6f7a83466677ab6095fcdd2d6f72583c4 /Documentation/devicetree/bindings/pci/hisilicon-pcie.txt | |
parent | macvlan: fix memory hole in macvlan_dev (diff) | |
parent | kmemcheck: rip it out for real (diff) | |
download | linux-dev-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.tar.xz linux-dev-51e18a453f5f59a40c721d4aeab082b4e2e9fac6.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflict was two parallel additions of include files to sch_generic.c,
no biggie.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/devicetree/bindings/pci/hisilicon-pcie.txt')
-rw-r--r-- | Documentation/devicetree/bindings/pci/hisilicon-pcie.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt b/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt index bdb7ab39d2d7..7bf9df047a1e 100644 --- a/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt +++ b/Documentation/devicetree/bindings/pci/hisilicon-pcie.txt @@ -21,7 +21,7 @@ Optional properties: - dma-coherent: Present if DMA operations are coherent. Hip05 Example (note that Hip06 is the same except compatible): - pcie@0xb0080000 { + pcie@b0080000 { compatible = "hisilicon,hip05-pcie", "snps,dw-pcie"; reg = <0 0xb0080000 0 0x10000>, <0x220 0x00000000 0 0x2000>; reg-names = "rc_dbi", "config"; |