projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7671395
)
ARM: dts: imx28-evk: remove duplicate property
author
Michael Heimpold
<mhei@heimpold.de>
Tue, 7 Oct 2014 21:00:39 +0000
(23:00 +0200)
committer
Shawn 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
|
blame
|
history
diff --git
a/arch/arm/boot/dts/imx28-evk.dts
b/arch/arm/boot/dts/imx28-evk.dts
index 0e13b4b10a929cb7d22beee36a5775948849c5a3..279249b8c3f3b1c50e682abd8103c47b2b017bbb 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>;