On Sun, Nov 25, 2012 at 05:56:58AM -0800, Olof Johansson wrote: > Hi, > > On Sun, Nov 25, 2012 at 1:37 AM, Russell King - ARM Linux > <[email protected]> wrote: > > Not much more to say... > > > > arch/arm/plat-omap/i2c.c:35:1: error: expected identifier or '(' before > > '<<' token > > Hmm. In for-next, line 35 is a blank line. > > Could this be because of a merge conflict in your local version? This > is one of the files that has conflicts with mainline right now; I'll > look to see if we can resolve those in our tree later today.
Hmm, it looks like a merge conflict which didn't get fixed up... and looking at it, it's beyond what I'd call trivial to fix. So I'll shut down the build system until that can be resolved properly; as OMAP is effectively unbuildable there's not much point it running the builds. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
