On Fri, Apr 13, 2012 at 12:32 PM, Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> wrote: > On Fri, Apr 13, 2012 at 10:01:52AM +0800, Shawn Guo wrote: >> That's because Mark's patch removes "#include >> <linux/regulator/consumer.h>" included indirectly by >> drivers/dma/ste_dma40.c from linux/amba/bus.h. The ste_dma40.c should >> really directly includes consumer.h. > > Okay, I'll drop this patch because it's causing regressions, so it can't > be pushed as a 'fix' during -rc. Actually *not* having Marks patch also causes a regression on Ux500, albeit not at compile time, but at runtime. So for me as ux500 maintainer it's perfectly OK to have compilation broken until that DMA patch arrives (should just be an issue of the DMA maintainer picking it up), but if others feel differently by all means hold it off until the other one arrives. 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
