diff options
| author | Mikael Pettersson <mikpe@it.uu.se> | 2009-09-28 18:26:25 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-09-29 11:15:37 +1000 |
| commit | bea1d35b8e1533ac493305b3efe04a4b7def8a7f (patch) | |
| tree | 3d0dc5219d36e1520fdef25cec670f2513274911 /drivers | |
| parent | 4c57edba4588ddba40017fbde3cd356e600bdf80 (diff) | |
| download | kernel_samsung_tuna-bea1d35b8e1533ac493305b3efe04a4b7def8a7f.zip kernel_samsung_tuna-bea1d35b8e1533ac493305b3efe04a4b7def8a7f.tar.gz kernel_samsung_tuna-bea1d35b8e1533ac493305b3efe04a4b7def8a7f.tar.bz2 | |
drm: fix drm_fb_helper warning when !CONFIG_MAGIC_SYSRQ
Compiling DRM throws the following warning if MAGIC_SYSRQ is disabled:
drivers/gpu/drm/drm_fb_helper.c:101: warning: 'sysrq_drm_fb_helper_restore_op' defined but not used
Fix: place sysrq_drm_fb_helper_restore_op and associated
definitions inside #ifdef CONFIG_MAGIC_SYSRQ.
Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers')
| -rw-r--r-- | 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 83d7b7d..819ddcb 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/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) { |