diff options
| author | Borislav Petkov <bp@suse.de> | 2021-06-07 11:02:30 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-06-07 11:02:30 +0200 |
| commit | 0a5f38c81e500976781908e172b4e51ee427b4a9 (patch) | |
| tree | fa2dc3fa36d8c837be12db611356581bcbe4289d /include/linux/console_struct.h | |
| parent | 7ee0e638a526b2d1f09c714f86d82dfd7628f322 (diff) | |
| parent | 614124bea77e452aa6df7a8714e8bc820b489922 (diff) | |
Merge tag 'v5.13-rc5' into x86/cleanups
Pick up dependent changes in order to base further cleanups ontop.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'include/linux/console_struct.h')
| -rw-r--r-- | include/linux/console_struct.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index 153734816b49..d5b9c8d40c18 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -101,6 +101,7 @@ struct vc_data { unsigned int vc_rows; unsigned int vc_size_row; /* Bytes per row */ unsigned int vc_scan_lines; /* # of scan lines */ + unsigned int vc_cell_height; /* CRTC character cell height */ unsigned long vc_origin; /* [!] Start of real screen */ unsigned long vc_scr_end; /* [!] End of real screen */ unsigned long vc_visible_origin; /* [!] Top of visible window */ |