Subject: [PATCH 1/3 -next] drm: fix build error when SYSRQ is disabled

From: Randy Dunlap <[email-masked]>
Date: Thu, 25 Mar 2010 11:29:05 -0700

From: Randy Dunlap <[email-masked]>

Fix build error when CONFIG_MAGIC_SYSRQ is not enabled:

drivers/gpu/drm/drm_fb_helper.c:915: error: 'sysrq_drm_fb_helper_restore_op' undeclared (first use in this function)
drivers/gpu/drm/drm_fb_helper.c:929: error: 'sysrq_drm_fb_helper_restore_op' undeclared (first use in this function)

Signed-off-by: Randy Dunlap <[email-masked]>
Cc: David Airlie <[email-masked]>
---
 drivers/gpu/drm/drm_fb_helper.c |    2 ++
 1 file changed, 2 insertions(+)

--- linux-next-20100325.orig/drivers/gpu/drm/drm_fb_helper.c
+++ linux-next-20100325/drivers/gpu/drm/drm_fb_helper.c
@@ -283,6 +283,8 @@ static struct sysrq_key_op sysrq_drm_fb_
 	.help_msg = "force-fb(V)",
 	.action_msg = "Restore framebuffer console",
 };
+#else
+static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { };
 #endif
 
 static void drm_fb_helper_on(struct fb_info *info)