Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-2.6-block.git] / drivers / gpu / drm / msm / dsi / pll / dsi_pll.h

diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h
index 80b6038334a601342d6637a50a6ecbd8140de008..2cf1664723e833820f9dec76f07c71137d3973b3 100644 (file)
--- 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);
 }