Merge branch 'for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

[karo-tx-linux.git] / arch / arm / boot / dts / imx28-cfa10058.dts

diff --git a/arch/arm/boot/dts/imx28-cfa10058.dts b/arch/arm/boot/dts/imx28-cfa10058.dts
index 7c9cc783f0d1a4c93d4385aabaab508c786dc465..f5c6dce34abece85594ce4674af9618d5c879157 100644 (file)
--- a/arch/arm/boot/dts/imx28-cfa10058.dts
+++ b/arch/arm/boot/dts/imx28-cfa10058.dts
@@ -51,10 +51,10 @@
                                pinctrl-names = "default";
                                pinctrl-0 = <&lcdif_24bit_pins_a
                                                 &lcdif_pins_cfa10058>;
-                               display = <&display>;
+                               display = <&display0>;
                                status = "okay";
 
-                               display: display {
+                               display0: display0 {
                                        bits-per-pixel = <32>;
                                        bus-width = <24>;