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 git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
stih410.dtsi
diff --git
a/arch/arm/boot/dts/stih410.dtsi
b/arch/arm/boot/dts/stih410.dtsi
index a3ef7341c051c267d15b31cdae104ba43e6bd1de..281a12424cf6c1a01b88495059057b19c198a4ab 100644
(file)
--- a/
arch/arm/boot/dts/stih410.dtsi
+++ b/
arch/arm/boot/dts/stih410.dtsi
@@
-193,7
+193,7
@@
<&clk_s_d2_quadfs 0>;
};
- sti-hdmi@8d04000 {
+ sti
_hdmi: sti
-hdmi@8d04000 {
compatible = "st,stih407-hdmi";
reg = <0x8d04000 0x1000>;
reg-names = "hdmi-reg";