Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751943AbaAXQyT (ORCPT ); Fri, 24 Jan 2014 11:54:19 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:35195 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751448AbaAXQyR (ORCPT ); Fri, 24 Jan 2014 11:54:17 -0500 Message-ID: <52E29A93.7020205@ti.com> Date: Fri, 24 Jan 2014 22:23:39 +0530 From: Balaji T K User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:15.0) Gecko/20120827 Thunderbird/15.0 MIME-Version: 1.0 To: Balaji T K CC: , , , , , , , , Subject: Re: [PATCH/RFC] dmaengine: omap-dma: split header file References: <20140119100235.GN27282@n2100.arm.linux.org.uk> <1390582316-4765-1-git-send-email-balajitk@ti.com> In-Reply-To: <1390582316-4765-1-git-send-email-balajitk@ti.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday 24 January 2014 10:21 PM, Balaji T K wrote: > To Resolve build failure seen with sh-allmodconfig: > include/linux/omap-dma.h:171:8: error: expected identifier before numeric constant > make[4]: *** [drivers/mmc/host/omap_hsmmc.o] Error 1 > due to CCR redefinition, move dmaengine consumer specific function to omap-dmaengine.h > > Tested-by: Geert Uytterhoeven s/Tested-by/Reported-by > Signed-off-by: Balaji T K > --- > drivers/mmc/host/omap_hsmmc.c | 2 +- > include/linux/omap-dma.h | 19 +------------------ > include/linux/omap-dmaengine.h | 21 +++++++++++++++++++++ > 3 files changed, 23 insertions(+), 19 deletions(-) > create mode 100644 include/linux/omap-dmaengine.h > > diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c > index dbd32ad..2f57e36 100644 > --- a/drivers/mmc/host/omap_hsmmc.c > +++ b/drivers/mmc/host/omap_hsmmc.c > @@ -31,7 +31,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > #include > diff --git a/include/linux/omap-dma.h b/include/linux/omap-dma.h > index 7af25a9..6aa97e5 100644 > --- a/include/linux/omap-dma.h > +++ b/include/linux/omap-dma.h > @@ -1,23 +1,6 @@ > -/* > - * OMAP DMA Engine support > - * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > - */ > #ifndef __LINUX_OMAP_DMA_H > #define __LINUX_OMAP_DMA_H > - > -struct dma_chan; > - > -#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE) > -bool omap_dma_filter_fn(struct dma_chan *, void *); > -#else > -static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d) > -{ > - return false; > -} > -#endif > +#include > > /* > * Legacy OMAP DMA handling defines and functions > diff --git a/include/linux/omap-dmaengine.h b/include/linux/omap-dmaengine.h > new file mode 100644 > index 0000000..2b0b6aa > --- /dev/null > +++ b/include/linux/omap-dmaengine.h > @@ -0,0 +1,21 @@ > +/* > + * OMAP DMA Engine support > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > +#ifndef __LINUX_OMAP_DMAENGINE_H > +#define __LINUX_OMAP_DMAENGINE_H > + > +struct dma_chan; > + > +#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE) > +bool omap_dma_filter_fn(struct dma_chan *, void *); > +#else > +static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d) > +{ > + return false; > +} > +#endif > +#endif /* __LINUX_OMAP_DMAENGINE_H */ > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/