diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2026-04-09 00:09:57 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2026-04-09 00:10:49 +0300 |
| commit | 1cd41aea795dc0553091a5ec43ae02a88caf24d7 (patch) | |
| tree | 62d23569eae2fa951f33072bb41a25b72d6e6192 /include/linux/console_struct.h | |
| parent | 5400b7eb666968f77e79f42531c5a138394f2f3f (diff) | |
| parent | 4516432284e1b2ad9e70de8067f779c9c1072189 (diff) | |
Merge drm/drm-next into drm-intel-next
Backmerge to unblock a topic branch for i915 and xe.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
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 13b35637bd5a..d5ca855116df 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -160,6 +160,7 @@ struct vc_data { struct uni_pagedict **uni_pagedict_loc; /* [!] Location of uni_pagedict variable for this console */ u32 **vc_uni_lines; /* unicode screen content */ u16 *vc_saved_screen; + u32 **vc_saved_uni_lines; unsigned int vc_saved_cols; unsigned int vc_saved_rows; /* additional information is in vt_kern.h */ |
