From: Gabriel Krisman Bertazi Date: Thu, 2 Feb 2017 19:39:00 +0000 (-0200) Subject: drm: Fix build when FBDEV_EMULATION is disabled X-Git-Tag: v4.11-rc1~83^2~26^2~3 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=7e6328fd1f84f366b4cc17dc757025f485139f1a;p=linux-block.git drm: Fix build when FBDEV_EMULATION is disabled Commit be7f735cd5ea ("drm: Rely on mode_config data for fb_helper initialization") broke the build when CONFIG_DRM_FBDEV_EMULATION is disabled because it didn't update the prototype for drm_fb_helper_init in that case. Fixes: be7f735cd5ea ("drm: Rely on mode_config data for fb_helper initialization") Signed-off-by: Gabriel Krisman Bertazi Signed-off-by: Daniel Vetter Link: http://patchwork.freedesktop.org/patch/msgid/20170202193900.22075-1-krisman@collabora.co.uk --- diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 278820ee17ad..6f5acebb266a 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -307,7 +307,7 @@ static inline void drm_fb_helper_prepare(struct drm_device *dev, } static inline int drm_fb_helper_init(struct drm_device *dev, - struct drm_fb_helper *helper, int crtc_count, + struct drm_fb_helper *helper, int max_conn) { return 0;