summaryrefslogtreecommitdiff
path: root/include/linux/console_struct.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2024-04-03 10:13:09 +0300
committerIngo Molnar <mingo@kernel.org>2024-04-03 10:13:09 +0300
commit9b4e528557944dff694c8afa5a8912de81503bf2 (patch)
tree7d4ff38fbf55e1d32e3384cac0ae2fc80d4ae179 /include/linux/console_struct.h
parentdfbc411e0a5ea72fdd563b2c7d627e9d993d865c (diff)
parent39cd87c4eb2b893354f3b850f916353f2658ae6f (diff)
downloadlinux-9b4e528557944dff694c8afa5a8912de81503bf2.tar.xz
Merge tag 'v6.9-rc2' into perf/core, to pick up dependent commits
Pick up fixes that followup patches are going to depend on. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/console_struct.h')
-rw-r--r--include/linux/console_struct.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index 539f1cd45309..20f564e98552 100644
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -151,7 +151,6 @@ struct vc_data {
DECLARE_BITMAP(vc_tab_stop, VC_TABSTOPS_COUNT); /* Tab stops. 256 columns. */
unsigned char vc_palette[16*3]; /* Colour palette for VGA+ */
unsigned short * vc_translate;
- unsigned int vc_resize_user; /* resize request from user */
unsigned int vc_bell_pitch; /* Console bell pitch */
unsigned int vc_bell_duration; /* Console bell duration */
unsigned short vc_cur_blink_ms; /* Cursor blink duration */