From: santosh.shilimkar@ti.com (Santosh Shilimkar)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] drivers/soc: ti: fix build break with modules
Date: Wed, 24 Sep 2014 15:32:53 -0400 [thread overview]
Message-ID: <54231C65.8050908@ti.com> (raw)
In-Reply-To: <1411585589-6108-1-git-send-email-olof@lixom.net>
On Wednesday 24 September 2014 03:06 PM, Olof Johansson wrote:
> Fixes below build break by not switching to stubs when the driver is a module:
>
> drivers/soc/ti/knav_dma.c:418:7: error: redefinition of 'knav_dma_open_channel'
> void *knav_dma_open_channel(struct device *dev, const char *name,
> ^
> In file included from drivers/soc/ti/knav_dma.c:26:0:
> include/linux/soc/ti/knav_dma.h:165:21: note: previous definition of 'knav_dma_open_channel' was here
> static inline void *knav_dma_open_channel(struct device *dev, const char *name,
> ^
>
> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Signed-off-by: Olof Johansson <olof@lixom.net>
> ---
> include/linux/soc/ti/knav_dma.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/soc/ti/knav_dma.h b/include/linux/soc/ti/knav_dma.h
> index e864a3e..dad035c 100644
> --- a/include/linux/soc/ti/knav_dma.h
> +++ b/include/linux/soc/ti/knav_dma.h
> @@ -157,7 +157,7 @@ struct knav_dma_desc {
> u32 pad[4];
> } ____cacheline_aligned;
>
> -#ifdef CONFIG_KEYSTONE_NAVIGATOR_DMA
> +#if IS_ENABLED(CONFIG_KEYSTONE_NAVIGATOR_DMA)
> void *knav_dma_open_channel(struct device *dev, const char *name,
> struct knav_dma_cfg *config);
> void knav_dma_close_channel(void *channel);
>
Thanks Olof for fixing it up.
Regards,
Santosh
prev parent reply other threads:[~2014-09-24 19:32 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-04 21:13 [GIT PULL] soc: Keystone SOC Navigator drivers for 3.18 Santosh Shilimkar
2014-09-24 4:43 ` Olof Johansson
2014-09-24 13:57 ` Santosh Shilimkar
2014-09-24 17:36 ` Olof Johansson
2014-09-24 19:06 ` [PATCH] drivers/soc: ti: fix build break with modules Olof Johansson
2014-09-24 19:32 ` Santosh Shilimkar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=54231C65.8050908@ti.com \
--to=santosh.shilimkar@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).