On Wed, Dec 19, 2012 at 09:18:28AM -0800, Tony Lindgren wrote:

Here's few more trivial build fixes caused by the merge
conflicts.

If Olof isn't able to pull this stuff in tonight, I'll pull it into my
tree and send it up with my stuff.  I'll also see about picking up
on the previous one with the common.c vram.h fix too.

I'm not sure what Olof's plans are, but I know Arnd isn't around at
the moment, and Olof was travelling a couple of days ago and hasn't
reappeared since.  I don't think we can leave these fixes any longer
as OMAP has been broken in mainline for at least the last four days
and we're nearing the end of the merge window.