The patch titled drm: fix drm_fb_helper warning when !CONFIG_MAGIC_SYSRQ has been removed from the -mm tree. Its filename was fix-drm_fb_helper-warning-when-config_magic_sysrq.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: drm: fix drm_fb_helper warning when !CONFIG_MAGIC_SYSRQ From: Mikael Pettersson <mikpe@xxxxxxxx> 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: Mikael Pettersson <mikpe@xxxxxxxx> Cc: Dave Airlie <airlied@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/gpu/drm/drm_fb_helper.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN drivers/gpu/drm/drm_fb_helper.c~fix-drm_fb_helper-warning-when-config_magic_sysrq drivers/gpu/drm/drm_fb_helper.c --- a/drivers/gpu/drm/drm_fb_helper.c~fix-drm_fb_helper-warning-when-config_magic_sysrq +++ a/drivers/gpu/drm/drm_fb_helper.c @@ -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_ .help_msg = "force-fb(V)", .action_msg = "Restore framebuffer console", }; +#endif static void drm_fb_helper_on(struct fb_info *info) { _ Patches currently in -mm which might be from mikpe@xxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html