Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 331377
b: refs/heads/master
c: 0bec30a
h: refs/heads/master
i:
  331375: d40a2cf
v: v3
  • Loading branch information
Thomas Petazzoni authored and Jason Cooper committed Sep 22, 2012
1 parent 02ce3c4 commit a9c5110
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d81b8bafc44b369b326b02af907554769e1b1434
refs/heads/master: 0bec30a7e3c2b044d232d679b049fd0c0421ea09
4 changes: 2 additions & 2 deletions trunk/arch/arm/boot/dts/armada-xp-db.dts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
*/

/dts-v1/;
/include/ "armada-xp.dtsi"
/include/ "armada-xp-mv78460.dtsi"

/ {
model = "Marvell Armada XP Evaluation Board";
compatible = "marvell,axp-db", "marvell,armadaxp", "marvell,armada-370-xp";
compatible = "marvell,axp-db", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";

chosen {
bootargs = "console=ttyS0,115200 earlyprintk";
Expand Down

0 comments on commit a9c5110

Please sign in to comment.