summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerenc Wagner <wferi@niif.hu>2009-04-06 14:55:09 +0200
committerEric Anholt <eric@anholt.net>2009-04-08 10:18:18 -0700
commit5b40f871158da7aaccff442645dae8b97c2e4d50 (patch)
tree11633d98103a653bb32b16bd840c5e447e2c474a
parent9dff6af860d6b7f661d4360eb859837afaca0a1b (diff)
downloadkernel-uprobes-5b40f871158da7aaccff442645dae8b97c2e4d50.tar.gz
kernel-uprobes-5b40f871158da7aaccff442645dae8b97c2e4d50.tar.xz
kernel-uprobes-5b40f871158da7aaccff442645dae8b97c2e4d50.zip
drm/i915: indicate framebuffer restore key in SysRq help message
At the same time, bring the action message closer to the usual format. Signed-off-by: Ferenc Wagner <wferi@niif.hu> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/intel_fb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index b7f0ebe9f81..3e094beecb9 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -864,8 +864,8 @@ static void intelfb_sysrq(int dummy1, struct tty_struct *dummy3)
static struct sysrq_key_op sysrq_intelfb_restore_op = {
.handler = intelfb_sysrq,
- .help_msg = "force fb",
- .action_msg = "force restore of fb console",
+ .help_msg = "force-fb(G)",
+ .action_msg = "Restore framebuffer console",
};
int intelfb_probe(struct drm_device *dev)