diff options
| author | Fancy Fang <chen.fang@nxp.com> | 2017-05-11 16:23:56 +0800 |
|---|---|---|
| committer | Anson Huang <Anson.Huang@nxp.com> | 2017-06-09 22:20:13 +0800 |
| commit | cfecd8b3bc4956ad603ab1b71f5fe632d9e6d78e (patch) | |
| tree | 6f36f14af8b23e4542b48d30055a9c862a78b3b5 /include | |
| parent | 643f8107432ded552c7455d1d48b1daa163ba7a6 (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')
| -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, |