Re: linux-next: manual merge of the usb tree with the arm-soc tree

[Stephen Rothwell]

Hi,

On Wed, 5 Oct 2011 11:52:39 +0300 Felipe Balbi <balbi@xxxxxx> wrote:
>
> looks ok, but I don't see omap_phy_internal.o being added anywhere.
> Maybe this hunk doesn't show...

Yeah, it didn't conflict, so there is a

obj-y                                   += omap_phy_internal.o

line a bit further down.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature