diff options
| author | Luis Henriques <luis.henriques@canonical.com> | 2016-02-03 14:25:15 +0000 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2016-03-03 11:55:26 -0500 |
| commit | 61965d3d5793f610bb44db04412d7d100612fc8e (patch) | |
| tree | 35b7cf6000998c1d2800825eaaec5cb15f402f98 /drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | |
| parent | 26f7d1f4d9ab108b28b8d0f340b98941073c6f4d (diff) | |
| download | lwn-61965d3d5793f610bb44db04412d7d100612fc8e.tar.gz lwn-61965d3d5793f610bb44db04412d7d100612fc8e.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/msm/dsi/pll/dsi_pll.h')
| -rw-r--r-- | drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h index 80b6038334a6..2cf1664723e8 100644 --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h @@ -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, int id); #else -struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init(struct platform_device *pdev, - int id) +static inline struct msm_dsi_pll *msm_dsi_pll_28nm_8960_init( + struct platform_device *pdev, int id) { return ERR_PTR(-ENODEV); } |