---

yaml --- r: 189359 b: refs/heads/master c: b8c40d6 h: refs/heads/master i: 189357: dbdc445 189355: 5bed836 189351: aa896b6 189343: 176b802 v: v3
git-mirror · Mar 31, 2010 · 3e07256 · 3e07256
1 parent a935122
commit 3e07256
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1e8a5dd4faf356b5d31c620c5787eaa83ee831d
+refs/heads/master: b8c40d6269d5e515341599b2e395f2dab4490d74
diff --git a/trunk/drivers/gpu/drm/drm_fb_helper.c b/trunk/drivers/gpu/drm/drm_fb_helper.c
@@ -283,6 +283,8 @@ static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = {
 	.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)