projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7671395)
ARM: dts: imx28-evk: remove duplicate property
authorMichael Heimpold <mhei@heimpold.de>
Tue, 7 Oct 2014 21:00:39 +0000 (23:00 +0200)
committerShawn Guo <shawn.guo@linaro.org>
Tue, 20 Jan 2015 11:39:28 +0000 (19:39 +0800)
Seems to be a left-over from an automatic merge.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
arch/arm/boot/dts/imx28-evk.dts patch | blob | history

diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index 0e13b4b..279249b 100644 (file)
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -182,7 +182,6 @@
                        };
 
                        lradc@80050000 {
-                               fsl,lradc-touchscreen-wires = <4>;
                                status = "okay";
                                fsl,lradc-touchscreen-wires = <4>;
                                fsl,ave-ctrl = <4>;