Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/msm/dsi: fix definition of msm_dsi_pll_28nm_8960_init()

This fixes the following build failure:

drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.o: In function `msm_dsi_pll_28nm_8960_init':
dsi_pll_28nm.c:(.text+0x1198): multiple definition of `msm_dsi_pll_28nm_8960_init'
drivers/gpu/drm/msm/dsi/pll/dsi_pll.o:dsi_pll.c:(.text+0x0): first defined here

Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Acked-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

authored by

Luis Henriques and committed by
Rob Clark
61965d3d 26f7d1f4

+2 -2
+2 -2
drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
··· 97 97 struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev, 98 98 int id); 99 99 #else 100 - struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev, 101 - int id) 100 + static inline struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init( 101 + struct platform_device *pdev, int id) 102 102 { 103 103 return ERR_PTR(-ENODEV); 104 104 }