diff options
| author | Thomas Zimmermann <[email protected]> | 2022-08-17 08:40:32 +0200 |
|---|---|---|
| committer | Thomas Zimmermann <[email protected]> | 2022-08-17 08:40:32 +0200 |
| commit | cf36ae3e5802716617b9e4d902a31048240396b0 (patch) | |
| tree | 2729abc9dae00a6ae10608fbd80bef8335442ed2 /include/linux/console_struct.h | |
| parent | 82a1356a933d8443139f8886f11b63c974a09a67 (diff) | |
| parent | 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (diff) | |
Merge drm/drm-fixes into drm-misc-fixes
Backmerging for v6.0-rc1.
Signed-off-by: Thomas Zimmermann <[email protected]>
Diffstat (limited to 'include/linux/console_struct.h')
| -rw-r--r-- | include/linux/console_struct.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index d5b9c8d40c18..1518568aaf0f 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -17,7 +17,7 @@ #include <linux/vt.h> #include <linux/workqueue.h> -struct uni_pagedir; +struct uni_pagedict; struct uni_screen; #define NPAR 16 @@ -157,8 +157,8 @@ struct vc_data { 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 */ + struct uni_pagedict *uni_pagedict; + struct uni_pagedict **uni_pagedict_loc; /* [!] Location of uni_pagedict variable for this console */ struct uni_screen *vc_uni_screen; /* unicode screen content */ /* additional information is in vt_kern.h */ }; |