Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx53-qsb-common.dtsi

diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 5e364a6672c0ed73e5fa770f86881dae37881017..41a2e2a2b07926235e321a206b7f0514546a8d2b 100644 (file)
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -22,7 +22,7 @@
                      <0xb0000000 0x20000000>;
        };
 
-       display0: display@di0 {
+       display0: disp0 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb565";
                pinctrl-names = "default";
@@ -172,7 +172,7 @@
                        >;
                };
 
-               led_pin_gpio7_7: led_gpio7_7@0 {
+               led_pin_gpio7_7: led_gpio7_7 {
                        fsl,pins = <
                                MX53_PAD_PATA_DA_1__GPIO7_7 0x80000000
                        >;