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 tag 'rtc-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
armada-xp-gp.dts
diff --git
a/arch/arm/boot/dts/armada-xp-gp.dts
b/arch/arm/boot/dts/armada-xp-gp.dts
index d62bf7bea1df4db579d8d22311d40ef8f0eaa25e..ac9eab8ac186c78ba88e0e03907f429886953e04 100644
(file)
--- a/
arch/arm/boot/dts/armada-xp-gp.dts
+++ b/
arch/arm/boot/dts/armada-xp-gp.dts
@@
-227,7
+227,7
@@
/* Port 2, Lane 0 */
status = "okay";
};
- pcie@
10
,0 {
+ pcie@
a
,0 {
/* Port 3, Lane 0 */
status = "okay";
};