summaryrefslogtreecommitdiff
path: root/include/linux/console_struct.h
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2021-07-01 07:32:37 +0530
committerViresh Kumar <viresh.kumar@linaro.org>2021-07-01 07:32:37 +0530
commitc503c193db7d7ccc0c58b1ef694eaef331318149 (patch)
tree44d3215196f385e88fa5da6affc58649c90e0ea9 /include/linux/console_struct.h
parent9821a195d4e263801884b105554e801642c59f2a (diff)
parent1eb5dde674f57b1a1918dab33f09e35cdd64eb07 (diff)
downloadlinux-c503c193db7d7ccc0c58b1ef694eaef331318149.tar.gz
linux-c503c193db7d7ccc0c58b1ef694eaef331318149.tar.bz2
linux-c503c193db7d7ccc0c58b1ef694eaef331318149.zip
Merge branch 'cpufreq/cppc-fie' into cpufreq/arm/linux-next
Diffstat (limited to 'include/linux/console_struct.h')
-rw-r--r--include/linux/console_struct.h1
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 */