Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[karo-tx-linux.git] / arch / arm / boot / dts / imx23-evk.dts

diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts
index a33f66c11b73edbf3671f02017e7780704c36b05..57e29977ba06c0ed82d60b220e08973d30b3da02 100644 (file)
--- a/arch/arm/boot/dts/imx23-evk.dts
+++ b/arch/arm/boot/dts/imx23-evk.dts
@@ -60,10 +60,10 @@
                                pinctrl-names = "default";
                                pinctrl-0 = <&lcdif_24bit_pins_a>;
                                lcd-supply = <&reg_lcd_3v3>;
-                               display = <&display>;
+                               display = <&display0>;
                                status = "okay";
 
-                               display: display {
+                               display0: display0 {
                                        bits-per-pixel = <32>;
                                        bus-width = <24>;