Hi Greg, Dmitry,
On Fri, 8 Aug 2008 11:26:46 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the usb.current tree got a conflict in
> drivers/usb/gadget/omap_udc.c between commit
> a09e64fbc0094e3073dbb09c3b4bfe4ab669244b ("[ARM] Move
> include/asm-arm/arch-* to arch/arm/*/include/mach") from the arm-current
> tree and commit b7eff3b991784964df1e7eeffd944032ccc3e11f ("USB: omap_udc:
> fix compilation with debug enabled") from the usb.current tree.
>
> Some of the arm header files have moved. I think I fixed it up right (I
> changed asm/arch/control.h to mach/control.h) and will carry the fix
> while necessary.
The arm changes here are now in Linus' tree, so this could be fixed up in
your patch.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp4KDa6fZjOA.pgp
Description: PGP signature
