projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'md/4.2' of git://neil.brown.name/md
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
boot
/
dts
/
sun6i-a31-m9.dts
diff --git
a/arch/arm/boot/dts/sun6i-a31-m9.dts
b/arch/arm/boot/dts/sun6i-a31-m9.dts
index a5660d61a96e9182a6d178ed1e042b56790a62c0..6e0e5687a09c73a03a6512bf2bf7f8015c6b4b12 100644
(file)
--- a/
arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/
arch/arm/boot/dts/sun6i-a31-m9.dts
@@
-48,7
+48,7
@@
#include <dt-bindings/pinctrl/sun4i-a10.h>
/ {
- model = "Mele M9
/ A1000G Quad
top set box";
+ model = "Mele M9 top set box";
compatible = "mele,m9", "allwinner,sun6i-a31";
aliases {