Re: linux-next: manual merge of the mmc tree with the slave-dma tree

[Vinod Koul]

On Fri, May 23, 2014 at 03:23:10PM +1000, Stephen Rothwell wrote:
> Hi Chris,
> 
> Today's linux-next merge of the mmc tree got a conflict in
> include/linux/omap-dma.h between commit a8246fedacad ("dmaengine: omap:
> hide filter_fn for built-in drivers") from the slave-dma tree and
> commit ee526d515ad1 ("mmc: omap_hsmmc: split omap-dma header file")
> from the mmc tree.
> 
> I fixed it up (I effectively applied the former commit to the new file)
> and can carry the fix as necessary (no action is required).
Looks fine to me

Thanks
-- 
~Vinod

> 
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Fri, 23 May 2014 15:19:48 +1000
> Subject: [PATCH] dmaengine: omap: fix for code movement
> 
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  include/linux/omap-dmaengine.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/omap-dmaengine.h b/include/linux/omap-dmaengine.h
> index 2b0b6aa01922..8e6906c72e90 100644
> --- a/include/linux/omap-dmaengine.h
> +++ b/include/linux/omap-dmaengine.h
> @@ -10,7 +10,7 @@
>  
>  struct dma_chan;
>  
> -#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE)
> +#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE))
>  bool omap_dma_filter_fn(struct dma_chan *, void *);
>  #else
>  static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d)
> -- 
> 2.0.0.rc4
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx



--

Attachment: signature.asc
Description: Digital signature