From 28f9e2d5c704302fe17fbacb31c9648d69f03cd3 Mon Sep 17 00:00:00 2001 From: Mikael Pettersson Date: Mon, 28 Sep 2009 18:26:25 +0200 Subject: [PATCH] --- yaml --- r: 166538 b: refs/heads/master c: bea1d35b8e1533ac493305b3efe04a4b7def8a7f h: refs/heads/master 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 a2c547905d66..f628150c5a17 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c57edba4588ddba40017fbde3cd356e600bdf80 +refs/heads/master: bea1d35b8e1533ac493305b3efe04a4b7def8a7f diff --git a/trunk/drivers/gpu/drm/drm_fb_helper.c b/trunk/drivers/gpu/drm/drm_fb_helper.c index 83d7b7d03863..819ddcbfcce5 100644 --- a/trunk/drivers/gpu/drm/drm_fb_helper.c +++ b/trunk/drivers/gpu/drm/drm_fb_helper.c @@ -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) {