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 'zonefs-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
marvell
/
armada-385-clearfog-gtr-s4.dts
diff --git
a/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
b/arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
index a7678a784c180145cd818e7782253d43179fefb3..5f83d981449ac80017ef21d6f88d5cce7ae56273 100644
(file)
--- a/
arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
+++ b/
arch/arm/boot/dts/marvell/armada-385-clearfog-gtr-s4.dts
@@
-4,6
+4,8
@@
/ {
model = "SolidRun Clearfog GTR S4";
+ compatible = "solidrun,clearfog-gtr-s4", "marvell,armada385",
+ "marvell,armada380";
};
&sfp0 {