Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bea1d35b authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Dave Airlie
Browse files

drm: fix drm_fb_helper warning when !CONFIG_MAGIC_SYSRQ 



Compiling DRM throws the following warning if MAGIC_SYSRQ is disabled:

drivers/gpu/drm/drm_fb_helper.c:101: warning: 'sysrq_drm_fb_helper_restore_op' defined but not used

Fix: place sysrq_drm_fb_helper_restore_op and associated
definitions inside #ifdef CONFIG_MAGIC_SYSRQ.

Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent 4c57edba

drivers/gpu/drm/drm_fb_helper.c

+2 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ void drm_fb_helper_restore(void) 
}

EXPORT_SYMBOL(drm_fb_helper_restore);



#ifdef CONFIG_MAGIC_SYSRQ

static void drm_fb_helper_restore_work_fn(struct work_struct *ignored)

{

	drm_fb_helper_restore();
@@ -296,6 +297,7 @@ static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { 
	.help_msg = "force-fb(V)",

	.action_msg = "Restore framebuffer console",

};

#endif



static void drm_fb_helper_on(struct fb_info *info)

{