From 3e07256b4e554240e9cd830b7f9cc418daeb8f04 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Thu, 25 Mar 2010 18:29:05 +0000
Subject: [PATCH] --- yaml --- r: 189359 b: refs/heads/master c:
 b8c40d6269d5e515341599b2e395f2dab4490d74 h: refs/heads/master i:   189357:
 dbdc445137826b21710d6e8a3ccd22608140bcff   189355:
 5bed836c518640e2080a62d96df349fb4b28ece0   189351:
 aa896b66c88f61d93d6a699042e6a693248f23da   189343:
 176b8025d0da0337724299d5573cd78f3601382e v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/gpu/drm/drm_fb_helper.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9cc16d43c273..333ae594c53d 100644
--- 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
index 50549703584f..99487237111d 100644
--- 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)