git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
pci
/
mvebu-pci.txt
diff --git
a/Documentation/devicetree/bindings/pci/mvebu-pci.txt
b/Documentation/devicetree/bindings/pci/mvebu-pci.txt
index 127ae1f53e5a2d5b4da6893efc7fba898a14fd27..6173af6885f86731a9e81182737afc0a185cd212 100644
(file)
--- a/
Documentation/devicetree/bindings/pci/mvebu-pci.txt
+++ b/
Documentation/devicetree/bindings/pci/mvebu-pci.txt
@@
-276,7
+276,7
@@
pcie-controller {
clocks = <&gateclk 26>;
};
- pcie@
10
,0 {
+ pcie@
a
,0 {
device_type = "pci";
assigned-addresses = <0x82005000 0 0x82000 0 0x2000>;
reg = <0x5000 0 0 0 0>;