On Fri, May 23, 2014 at 10:32 AM, Lee Jones <lee.jones@xxxxxxxxxx> wrote: > Nope, this branch is broken too. I don't think this is a merge error, > I think it's programmer error (even the greats make mistakes =:-) ). Yeah you're right :-( :-( Sorry for the mess. > In the mean time, it might be worth you looking at your build system, > as it seems to be overlooking drivers/mfd/stmpe.c. This indeed seems to be the problem. Thanks for covering up my stupid mistakes, I owe you one. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html