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 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6qdl-sabrelite.dtsi
diff --git
a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
index 356ac7666707d04c2d6642995230bf74a4780c70..35de7adc997bf6f86ed047515bbaa2a09872b2c3 100644
(file)
--- a/
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+++ b/
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
@@
-221,7
+221,7
@@
status = "okay";
};
- lcd_display: disp
lay@di
0 {
+ lcd_display: disp0 {
compatible = "fsl,imx-parallel-display";
#address-cells = <1>;
#size-cells = <0>;