diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-09-01 09:35:24 -0400 |
| commit | 067e2601d3c076abbf45db91261f9065eaa879b2 (patch) | |
| tree | 86c8d4b913873dbd3b4ff23562a3a8597984b4df /include/linux/console_struct.h | |
| parent | 3e097d1271ecdff2f251a54ddfc5eaa1f9821e96 (diff) | |
| parent | 931830aa5c251e0803523213428f777a48bde254 (diff) | |
Merge branch 'for-4.3/gembird' into for-linus
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 */ |