diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-03 13:01:44 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-09-03 13:01:44 -0400 |
commit | 01b944fe1cd4e21a2a9ed51adbdbafe2d5e905ba (patch) | |
tree | 85f506cf9fce3d8fd47cf624dd8698472bffc13f /include/linux/console_struct.h | |
parent | e51e38494a8ecc18650efb0c840600637891de2c (diff) | |
parent | 58f1eae48e5372200553de07b5ecc7574803ee91 (diff) |
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.3 merge window.
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 e859c98d1767..e329ee2667e1 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h | |||
@@ -104,6 +104,7 @@ struct vc_data { | |||
104 | unsigned int vc_resize_user; /* resize request from user */ | 104 | unsigned int vc_resize_user; /* resize request from user */ |
105 | unsigned int vc_bell_pitch; /* Console bell pitch */ | 105 | unsigned int vc_bell_pitch; /* Console bell pitch */ |
106 | unsigned int vc_bell_duration; /* Console bell duration */ | 106 | unsigned int vc_bell_duration; /* Console bell duration */ |
107 | unsigned short vc_cur_blink_ms; /* Cursor blink duration */ | ||
107 | struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg console for this display */ | 108 | struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg console for this display */ |
108 | struct uni_pagedir *vc_uni_pagedir; | 109 | struct uni_pagedir *vc_uni_pagedir; |
109 | struct uni_pagedir **vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */ | 110 | struct uni_pagedir **vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */ |