diff options
| author | Mark Brown <broonie@kernel.org> | 2021-06-01 18:33:33 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-01 18:33:33 +0100 |
| commit | 1a435466b0d470eb9095da0efefea5f7f69acf9c (patch) | |
| tree | a661a705f8236cf7bd86ff250de2f627c9f0a333 /include/linux/console_struct.h | |
| parent | 5cb4e1f33e5eeadbce3814282e010d4dd31816af (diff) | |
| parent | 2ec6f20b33eb4f62ab90bdcd620436c883ec3af6 (diff) | |
| download | cachepc-linux-1a435466b0d470eb9095da0efefea5f7f69acf9c.tar.gz cachepc-linux-1a435466b0d470eb9095da0efefea5f7f69acf9c.zip | |
Merge branch 'for-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.14
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 */ |