Gitweb:     http://git.kernel.org/linus/b8c40d6269d5e515341599b2e395f2dab4490d74
Commit:     b8c40d6269d5e515341599b2e395f2dab4490d74
Parent:     e1e8a5dd4faf356b5d31c620c5787eaa83ee831d
Author:     Randy Dunlap <randy.dunlap@oracle.com>
AuthorDate: Thu Mar 25 18:29:05 2010 +0000
Committer:  Dave Airlie <airlied@redhat.com>
CommitDate: Wed Mar 31 13:12:52 2010 +1000

    drm: fix build error when SYSRQ is disabled
    
    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 <randy.dunlap@oracle.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/drm_fb_helper.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 5054970..9948723 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/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)
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html