diff options
| author | Rob Clark <[email protected]> | 2023-03-20 10:31:25 -0700 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2023-03-20 10:31:25 -0700 |
| commit | e752ab11dcb48353727ea26eefd740155e028865 (patch) | |
| tree | bbd47198be4e42bbf990096ca36e96f3da40cfb6 /include/linux/console_struct.h | |
| parent | 1844e680d56bb0c4e0489138f2b7ba2dc1c988e3 (diff) | |
| parent | 8bf6e20253b2d2b614f2c0b491f840e956fa6b05 (diff) | |
Merge remote-tracking branch 'drm/drm-next' into msm-next
Merge drm-next into msm-next to pick up external clk and PM dependencies
for improved a6xx GPU reset sequence.
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'include/linux/console_struct.h')
| -rw-r--r-- | include/linux/console_struct.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index 1518568aaf0f..539f1cd45309 100644 --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h @@ -18,7 +18,6 @@ #include <linux/workqueue.h> struct uni_pagedict; -struct uni_screen; #define NPAR 16 #define VC_TABSTOPS_COUNT 256U @@ -159,7 +158,7 @@ struct vc_data { struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg console for this display */ 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 */ + u32 **vc_uni_lines; /* unicode screen content */ /* additional information is in vt_kern.h */ }; |