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 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
armada-385.dtsi
diff --git
a/arch/arm/boot/dts/armada-385.dtsi
b/arch/arm/boot/dts/armada-385.dtsi
index f011009bf4cf3ec3ce0dd411693df6c4c6bfe0b3..6283d7912f71b8e826117f3edd3bd26c67c059bc 100644
(file)
--- a/
arch/arm/boot/dts/armada-385.dtsi
+++ b/
arch/arm/boot/dts/armada-385.dtsi
@@
-16,7
+16,7
@@
/ {
model = "Marvell Armada 385 family SoC";
- compatible = "marvell,armada385", "marvell,armada38
x
";
+ compatible = "marvell,armada385", "marvell,armada38
0
";
cpus {
#address-cells = <1>;