[PATCH RESEND V2] ARM: debug: move StrongARM debug include to arch/arm/include/debug

[Arnd Bergmann]

On Friday 14 November 2014, Dmitry Eremin-Solenikov wrote:
> 
> 2014-11-06 10:20 GMT+03:00 Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>:
> > StrongARM debug-macro.S is quite standalone thing, depending only on
> > register mappings. Move it to proper place and add Kconfig entry.
> >
> > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov at gmail.com>
> > ---
> > [Changes since V1: keep Kconfig.debug sorted alphabetically]
> >
> >  arch/arm/Kconfig.debug                                         |  9 +++++++++
> >  .../include/mach/debug-macro.S => include/debug/sa1100.S}      | 10 ++++++++--
> >  2 files changed, 17 insertions(+), 2 deletions(-)
> >  rename arch/arm/{mach-sa1100/include/mach/debug-macro.S => include/debug/sa1100.S} (83%)
> 
> Dear Russell,
> 
> Is it ok to merge this patch? Would you like to pick it on your own?
> Would you like
> for Arnd to take it through arm-soc? Would you like for me to throw it
> out (and why)?

I've merged it into the next/soc branch of arm-soc now. Russell,
let me know if you have any objections.

There was a trivial merge conflict that I resolved.

	Arnd