From: Michael Heimpold Date: Tue, 7 Oct 2014 21:00:39 +0000 (+0200) Subject: ARM: dts: imx28-evk: remove duplicate property X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=16baf8ddd84b36e6880092da777a67de362f8677;p=deliverable%2Flinux.git ARM: dts: imx28-evk: remove duplicate property Seems to be a left-over from an automatic merge. Signed-off-by: Michael Heimpold Reviewed-by: Fabio Estevam Signed-off-by: Shawn Guo --- diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts index 0e13b4b10a92..279249b8c3f3 100644 --- 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>;