| Message ID | 1412715639-9565-1-git-send-email-mhei@heimpold.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 7, 2014 at 6:00 PM, Michael Heimpold <mhei@heimpold.de> wrote: > Seems to be a left-over from an automatic merge. > > Signed-off-by: Michael Heimpold <mhei@heimpold.de> > Cc: Fabio Estevam <fabio.estevam@freescale.com> > --- > arch/arm/boot/dts/imx28-evk.dts | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts > index 09664fc..2944d39 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>; Thanks Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Hi Shawn, [Fix Shawn's mail address] > Fabio Estevam <festevam@gmail.com> hat am 8. Oktober 2014 um 02:18 > geschrieben: > > > On Tue, Oct 7, 2014 at 6:00 PM, Michael Heimpold <mhei@heimpold.de> wrote: > > Seems to be a left-over from an automatic merge. > > > > Signed-off-by: Michael Heimpold <mhei@heimpold.de> > > Cc: Fabio Estevam <fabio.estevam@freescale.com> > > --- > > arch/arm/boot/dts/imx28-evk.dts | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/arch/arm/boot/dts/imx28-evk.dts > > b/arch/arm/boot/dts/imx28-evk.dts > > index 09664fc..2944d39 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>; > > Thanks > > Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com> > did you get this patch? Best regards Stefan Wahren
On Mon, Dec 22, 2014 at 11:55:31AM +0100, Stefan Wahren wrote: > Hi Shawn, > > [Fix Shawn's mail address] > > > Fabio Estevam <festevam@gmail.com> hat am 8. Oktober 2014 um 02:18 > > geschrieben: > > > > > > On Tue, Oct 7, 2014 at 6:00 PM, Michael Heimpold <mhei@heimpold.de> wrote: > > > Seems to be a left-over from an automatic merge. > > > > > > Signed-off-by: Michael Heimpold <mhei@heimpold.de> > > > Cc: Fabio Estevam <fabio.estevam@freescale.com> > > > --- > > > arch/arm/boot/dts/imx28-evk.dts | 1 - > > > 1 file changed, 1 deletion(-) > > > > > > diff --git a/arch/arm/boot/dts/imx28-evk.dts > > > b/arch/arm/boot/dts/imx28-evk.dts > > > index 09664fc..2944d39 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>; > > > > Thanks > > > > Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com> > > > > did you get this patch? Sorry, missed it. Applied. Shawn
diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts index 09664fc..2944d39 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>;
Seems to be a left-over from an automatic merge. Signed-off-by: Michael Heimpold <mhei@heimpold.de> Cc: Fabio Estevam <fabio.estevam@freescale.com> --- arch/arm/boot/dts/imx28-evk.dts | 1 - 1 file changed, 1 deletion(-)