summaryrefslogtreecommitdiffstats
path: root/include/linux/console_struct.h
diff options
context:
space:
mode:
authorJames Morris <james.morris@microsoft.com>2019-03-26 16:28:01 -0700
committerJames Morris <james.morris@microsoft.com>2019-03-26 16:28:01 -0700
commit9d7b7bfbafba5e6cad609f1188243a7f0cd0d293 (patch)
tree3bc87cf11ab44f10a2000bb8ab22ca361a944621 /include/linux/console_struct.h
parent468e91cecb3218afd684b8c422490dfebe0691bb (diff)
parent8c2ffd9174779014c3fe1f96d9dc3641d9175f00 (diff)
downloadcachepc-linux-9d7b7bfbafba5e6cad609f1188243a7f0cd0d293.tar.gz
cachepc-linux-9d7b7bfbafba5e6cad609f1188243a7f0cd0d293.zip
Merge tag 'v5.1-rc2' into next-general
Merge to Linux 5.1-rc2 for subsystems to work with.
Diffstat (limited to 'include/linux/console_struct.h')
-rw-r--r--include/linux/console_struct.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index ab137f97ecbd..ed798e114663 100644
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -119,7 +119,7 @@ struct vc_data {
unsigned int vc_s_blink : 1;
unsigned int vc_s_reverse : 1;
/* misc */
- unsigned int vc_ques : 1;
+ unsigned int vc_priv : 3;
unsigned int vc_need_wrap : 1;
unsigned int vc_can_do_color : 1;
unsigned int vc_report_mouse : 2;