drm: fix drm_fb_helper warning when !CONFIG_MAGIC_SYSRQ
authorMikael Pettersson <mikpe@it.uu.se>
Mon, 28 Sep 2009 16:26:25 +0000 (18:26 +0200)
committerDave Airlie <airlied@linux.ie>
Tue, 29 Sep 2009 01:15:37 +0000 (11:15 +1000)
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@it.uu.se>
Signed-off-by: Dave Airlie <airlied@linux.ie>
drivers/gpu/drm/drm_fb_helper.c

index 83d7b7d0386336555f6861aec3ec5df166c8374d..819ddcbfcce5b6ceb51433f65e0b9acd15f0018a 100644 (file)
@@ -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)
 {