projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e4563f6)
drm: Fix build when FBDEV_EMULATION is disabled
authorGabriel Krisman Bertazi <krisman@collabora.co.uk>
Thu, 2 Feb 2017 19:39:00 +0000 (17:39 -0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 2 Feb 2017 19:40:32 +0000 (20:40 +0100)
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 <krisman@collabora.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20170202193900.22075-1-krisman@collabora.co.uk
include/drm/drm_fb_helper.h patch | blob | blame | history

diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h
index 278820ee17ad24ceacdecfbe36eb61389fb83ba2..6f5acebb266aa74fcc6861a3712b56e0ad2046ae 100644 (file)
--- 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;