diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2015-07-06 13:54:28 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2015-07-06 13:54:28 -0700 |
| commit | 83dcf400be7165af938dbd6b8ce6805c754701db (patch) | |
| tree | 495ee9420e3e5478e91425a249be15504ba2dcd3 /include/linux/console_struct.h | |
| parent | 392d39cfcaa9bcfa202fb0fd3bc65f3c20de318f (diff) | |
| parent | d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff) | |
Merge 4.2-rc1 into MTD -next
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 { 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 */ struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg console for this display */ struct uni_pagedir *vc_uni_pagedir; struct uni_pagedir **vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */ |