leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Luis Henriques 2016-02-03 14:25:15 +00:00 committed by Rob Clark
parent 26f7d1f4d9
commit 61965d3d57
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
View File

@ -97,8 +97,8 @@ static inline struct msm_dsi_pll *msm_dsi_pll_28nm_init(
struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev, struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev,
int id); int id);
#else #else
struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev, static inline struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(
int id) struct platform_device *pdev, int id)
{ {
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
} }