diff options
author | Michael Heimpold <mhei@heimpold.de> | 2014-10-07 23:00:39 +0200 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2015-01-20 19:39:28 +0800 |
commit | 16baf8ddd84b36e6880092da777a67de362f8677 (patch) | |
tree | 7761318d7a37f2c46454db9c0f2b32e0ef0389f8 /arch/arm/boot/dts/imx28-evk.dts | |
parent | 767139540cbf72886112f427e0691acd5c12f8eb (diff) |
ARM: dts: imx28-evk: remove duplicate propertyimx-dt-3.20
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>
Diffstat (limited to 'arch/arm/boot/dts/imx28-evk.dts')
-rw-r--r-- | arch/arm/boot/dts/imx28-evk.dts | 1 |
1 files changed, 0 insertions, 1 deletions
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>; |