diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 07:40:31 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 07:40:31 +0100 |
| commit | b5c00a3a412857d6f07970984068c450429e051c (patch) | |
| tree | 1fde50630cbc24e11a45169f717f281db8eb6dcc /drivers/video/console/vgacon.c | |
| parent | sh: pfc: Fixup type mismatch in debug printks. (diff) | |
| parent | Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/l... (diff) | |
| download | linux-b5c00a3a412857d6f07970984068c450429e051c.tar.xz linux-b5c00a3a412857d6f07970984068c450429e051c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.33
Diffstat (limited to 'drivers/video/console/vgacon.c')
| -rw-r--r-- | drivers/video/console/vgacon.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c index da55ccaf4d55..cc4bbbe44aca 100644 --- a/drivers/video/console/vgacon.c +++ b/drivers/video/console/vgacon.c @@ -585,6 +585,11 @@ static void vgacon_init(struct vc_data *c, int init) vgacon_uni_pagedir[1]++; if (!vgacon_uni_pagedir[0] && p) con_set_default_unimap(c); + + /* Only set the default if the user didn't deliberately override it */ + if (global_cursor_default == -1) + global_cursor_default = + !(screen_info.flags & VIDEO_FLAGS_NOCURSOR); } static void vgacon_deinit(struct vc_data *c) |