Hi Carlo, On Fri, 26 Sep 2014 10:19:43 +0200 Carlo Caione <carlo@xxxxxxxxxx> wrote: > > Am I going blind or these two lines are missing from d8a00916b303 > > + default 0xc81004c0 if DEBUG_MESON_UARTAO > ... > + default 0xf31004c0 if DEBUG_MESON_UARTAO They are in the final version of arch/arm/Kconfig.debug, just not shown in the conflict resolution above. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
signature.asc
Description: PGP signature
