* Mark A. Greer <mgreer@xxxxxxxxxxxxxxx> [121119 10:58]: > @@ -27,6 +29,10 @@ > #include <linux/platform_device.h> > #include <linux/scatterlist.h> > #include <linux/dma-mapping.h> > +#ifndef OMAP_SHAM_DMA_PRIVATE > +#include <linux/dmaengine.h> > +#include <linux/omap-dma.h> > +#endif > #include <linux/pm_runtime.h> > #include <linux/delay.h> > #include <linux/crypto.h> I think you should be able to drop the OMAP_SHAM_DMA_PRIVATE from the include after I'll post one more patch to move the omap private DMA header to linux/dma-mapping.h that we already have until the dmaengine conversion is completed. > @@ -37,8 +43,10 @@ > #include <crypto/hash.h> > #include <crypto/internal/hash.h> > > +#ifdef OMAP_SHAM_DMA_PRIVATE > #include <plat/dma.h> And then this can be dropped. > #include <mach/irqs.h> But this needs to go too, as we have that only for omap1 when ARM multiplatform is enabled for omap2+. The interrupt should be passed in platform_data. However, if there are some indirect dependencies for omap1, you can just put it into ifdef CONFIG_ARCH_OMAP1 for now. There's probably the same issue for the other series you posted. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
