diff options
| author | James Morris <jmorris@namei.org> | 2009-12-09 19:01:03 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-12-09 19:01:03 +1100 |
| commit | 1ad1f10cd915744bbe52b19423653b38287d827d (patch) | |
| tree | ae072aace36b45a55d80b8cbf1b6d92523a88ea0 /drivers/video/console/vgacon.c | |
| parent | 08e3daff217059c84c360cc71212686e0a7995af (diff) | |
| parent | 2b876f95d03e226394b5d360c86127cbefaf614b (diff) | |
| download | kernel-crypto-1ad1f10cd915744bbe52b19423653b38287d827d.tar.gz kernel-crypto-1ad1f10cd915744bbe52b19423653b38287d827d.tar.xz kernel-crypto-1ad1f10cd915744bbe52b19423653b38287d827d.zip | |
Merge branch 'master' into next
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 da55ccaf4d5..cc4bbbe44ac 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) |