diff options
author | Dave Airlie <airlied@redhat.com> | 2013-02-07 21:13:43 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2013-02-07 21:13:43 -0500 |
commit | 62cd2fa82a38cb3d653517822c62a39cdbb5f365 (patch) | |
tree | b5d2f198c14455822c8b03abde2c8d8080cda24a /drivers/tty/vt | |
parent | 6dc1c49da6dd3bf020a66b2a135b9625ac01c2c7 (diff) | |
parent | ae1287865f5361fa138d4d3b1b6277908b54eac9 (diff) |
Merge branch 'console-fixes' into drm-next
(not the fbcon maintainer pull 2)
fix bug in vgacon on bootup and fbcon losing fonts on startup.
* console-fixes: (50 commits)
fbcon: don't lose the console font across generic->chip driver switch
vgacon/vt: clear buffer attributes when we load a 512 character font (v2)
Diffstat (limited to 'drivers/tty/vt')
-rw-r--r-- | drivers/tty/vt/vt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 457c41fe7eb9..ed43a7f88b4f 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c | |||
@@ -638,7 +638,7 @@ static inline void save_screen(struct vc_data *vc) | |||
638 | * Redrawing of screen | 638 | * Redrawing of screen |
639 | */ | 639 | */ |
640 | 640 | ||
641 | static void clear_buffer_attributes(struct vc_data *vc) | 641 | void clear_buffer_attributes(struct vc_data *vc) |
642 | { | 642 | { |
643 | unsigned short *p = (unsigned short *)vc->vc_origin; | 643 | unsigned short *p = (unsigned short *)vc->vc_origin; |
644 | int count = vc->vc_screenbuf_size / 2; | 644 | int count = vc->vc_screenbuf_size / 2; |