[PATCH 1/2] ARM: boot/dts/Makefile: drop '\'

[Olof Johansson]

On Wed, Apr 10, 2013 at 10:35 AM, Stephen Warren <swarren at wwwdotorg.org> wrote:
> On 04/10/2013 03:17 AM, Jean-Christophe PLAGNIOL-VILLARD wrote:
>> when adding multiple new platform this generate comflict
>
> "When" and "conflict".
>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>
>> -ifeq ($(CONFIG_OF),y)
>
>> -targets += dtbs
>> -targets += $(dtb-y)
>> -endif
>> -
>> -# *.dtb used to be generated in the directory above. Clean out the
>> -# old build results so people don't accidentally use them.
>> -dtbs: $(addprefix $(obj)/, $(dtb-y))
>> -     $(Q)rm -f $(obj)/../*.dtb
>> -
>> -clean-files := *.dtb
>
> I'm not sure why those parts show up in the diff. I guess the -/+ lines
> look the same though, so the result is fine. did line-endings change or
> something?

There's no point in picking up this patch now if the move to
directories will happen in a release or two, it's again pure churn. We
can live with the conflicts for another release.


-Olof