diff options
| author |   Olof Johansson <olof@lixom.net> | 2014-09-24 11:42:38 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-09-24 11:53:39 -0700 |
| commit | b2fc3f3c6d397d434174147eca3db1ec778195ce (patch) | |
| tree | f0dc84187f2d13952bf2959368813c39780ba6e4 /include/linux/soc/ti | |
| parent | Merge tag 'drivers-soc-ti-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/drivers (diff) | |
| download | linux-dev-b2fc3f3c6d397d434174147eca3db1ec778195ce.tar.xz linux-dev-b2fc3f3c6d397d434174147eca3db1ec778195ce.zip | |
drivers/soc: ti: fix build break with modules
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>
Diffstat (limited to 'include/linux/soc/ti')
| -rw-r--r-- | include/linux/soc/ti/knav_dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/soc/ti/knav_dma.h b/include/linux/soc/ti/knav_dma.h index e864a3eb9ac4..dad035c16d94 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); |