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 /include/linux/vt_kern.h | |
| 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 'include/linux/vt_kern.h')
| -rw-r--r-- | include/linux/vt_kern.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/vt_kern.h b/include/linux/vt_kern.h index dbbc6bfee71f..e8d65718560b 100644 --- a/include/linux/vt_kern.h +++ b/include/linux/vt_kern.h | |||
| @@ -47,6 +47,7 @@ int con_set_cmap(unsigned char __user *cmap); | |||
| 47 | int con_get_cmap(unsigned char __user *cmap); | 47 | int con_get_cmap(unsigned char __user *cmap); |
| 48 | void scrollback(struct vc_data *vc, int lines); | 48 | void scrollback(struct vc_data *vc, int lines); |
| 49 | void scrollfront(struct vc_data *vc, int lines); | 49 | void scrollfront(struct vc_data *vc, int lines); |
| 50 | void clear_buffer_attributes(struct vc_data *vc); | ||
| 50 | void update_region(struct vc_data *vc, unsigned long start, int count); | 51 | void update_region(struct vc_data *vc, unsigned long start, int count); |
| 51 | void redraw_screen(struct vc_data *vc, int is_switch); | 52 | void redraw_screen(struct vc_data *vc, int is_switch); |
| 52 | #define update_screen(x) redraw_screen(x, 0) | 53 | #define update_screen(x) redraw_screen(x, 0) |