diff options
| author | Mikael Pettersson <mikpe@it.uu.se> | 2009-09-28 12:26:25 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-09-28 21:15:37 -0400 |
| commit | bea1d35b8e1533ac493305b3efe04a4b7def8a7f (patch) | |
| tree | 3d0dc5219d36e1520fdef25cec670f2513274911 | |
| parent | 4c57edba4588ddba40017fbde3cd356e600bdf80 (diff) | |
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>
| -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 83d7b7d03863..819ddcbfcce5 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) | |||
| 280 | } | 280 | } |
| 281 | EXPORT_SYMBOL(drm_fb_helper_restore); | 281 | EXPORT_SYMBOL(drm_fb_helper_restore); |
| 282 | 282 | ||
| 283 | #ifdef CONFIG_MAGIC_SYSRQ | ||
| 283 | static void drm_fb_helper_restore_work_fn(struct work_struct *ignored) | 284 | static void drm_fb_helper_restore_work_fn(struct work_struct *ignored) |
| 284 | { | 285 | { |
| 285 | drm_fb_helper_restore(); | 286 | drm_fb_helper_restore(); |
| @@ -296,6 +297,7 @@ static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { | |||
| 296 | .help_msg = "force-fb(V)", | 297 | .help_msg = "force-fb(V)", |
| 297 | .action_msg = "Restore framebuffer console", | 298 | .action_msg = "Restore framebuffer console", |
| 298 | }; | 299 | }; |
| 300 | #endif | ||
| 299 | 301 | ||
| 300 | static void drm_fb_helper_on(struct fb_info *info) | 302 | static void drm_fb_helper_on(struct fb_info *info) |
| 301 | { | 303 | { |
