Hi Greg,

On Tue, 4 Jan 2011 15:58:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
quoted text
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/host/ehci-hcd.c between commit
> 760efe6910d5743084b586d3d0a3b65aea96fb2f ("USB: cns3xxx: Add EHCI and
> OHCI bus glue for cns3xxx SOCs") from the arm tree and various commits
> from the usb tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

The fix was not quite right (I left out a "#endif") - I fixed that up.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/