diff options
| author | Fancy Fang <chen.fang@nxp.com> | 2017-05-11 16:23:56 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | bfc319ddb8a3f7b2f3ecd3dd8e903826e3866279 (patch) | |
| tree | 1a965e0965aca9e3041a822730b6d2bad3e8c1b4 /include/linux/pxp_dma.h | |
| parent | 40dd49f0a7c0f246b017f7fe23c197605c83c01b (diff) | |
MLK-14885 dma: pxp: fix potential multi-definition issue
When 'CONFIG_MXC_PXP_CLIENT_DEVICE' disabled, the
'register_pxp_device' and 'unregister_pxp_device'
may cause multiple definitions compiling error.
Signed-off-by: Fancy Fang <chen.fang@nxp.com>
Diffstat (limited to 'include/linux/pxp_dma.h')
| -rw-r--r-- | include/linux/pxp_dma.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pxp_dma.h b/include/linux/pxp_dma.h index 61e38a71d511..a48871caebfc 100644 --- a/include/linux/pxp_dma.h +++ b/include/linux/pxp_dma.h @@ -67,8 +67,8 @@ void pxp_txd_ack(struct dma_async_tx_descriptor *txd, int register_pxp_device(void); void unregister_pxp_device(void); #else -int register_pxp_device(void) { return 0; } -void unregister_pxp_device(void) {} +static int register_pxp_device(void) { return 0; } +static void unregister_pxp_device(void) {} #endif void pxp_fill( u32 bpp, |