diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 13:35:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-08 13:35:29 -0800 |
| commit | 830cd2ac6ecce6b027d947fcdc724dd27a33813a (patch) | |
| tree | 08d4f60e9176292f98e47d1f50b77f1f49ec0122 /drivers/video | |
| parent | 64227cd83d5f9d7b7ce5514a693252c2952366f6 (diff) | |
| parent | b434a680a29424856e0f40199daa9f65963c7cb4 (diff) | |
| download | linux-830cd2ac6ecce6b027d947fcdc724dd27a33813a.tar.gz linux-830cd2ac6ecce6b027d947fcdc724dd27a33813a.tar.bz2 linux-830cd2ac6ecce6b027d947fcdc724dd27a33813a.zip | |
Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
vgacon: Add support for setting the default cursor state
vc: Add support for hiding the cursor when creating VTs
x86, setup: Store the boot cursor state
Diffstat (limited to 'drivers/video')
| -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) |