From d4e0be6e8f5d6cab1f516ebeb8ad0dff6033311b Mon Sep 17 00:00:00 2001 From: Fancy Fang Date: Thu, 11 May 2017 16:23:56 +0800 Subject: [PATCH] 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 --- include/linux/pxp_dma.h | 4 ++-- 1 file 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, -- 2.17.1