Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6q-apalis-ixora.dts

diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
index 60d33e99de76037cf546c8000ade4304c959c1c6..40b2c67fe7af2c1511c19de5171ac55541be442b 100644 (file)
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -76,7 +76,7 @@
                };
        };
 
-       lcd_display: display@di0 {
+       lcd_display: disp0 {
                compatible = "fsl,imx-parallel-display";
                #address-cells = <1>;
                #size-cells = <0>;