diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-10-06 12:34:58 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-10-06 12:38:28 +1000 |
| commit | 86fdf61e71046618f6f499542cee12f2348c523c (patch) | |
| tree | ca4e67019e5442a02f804ebccf1687cac095077a /drivers/video/fbdev/core/fbcon_rotate.c | |
| parent | 549738f15da0e5a00275977623be199fbbf7df50 (diff) | |
| parent | 27204b99b08289d0993cb77c22470034b5eb974d (diff) | |
Merge tag 'drm-misc-fixes-2020-10-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixesdrm-fixes-2020-10-06-1drm-fixes-2020-10-06
drm-misc-fixes for v5.9:
- Small doc fix.
- Re-add FB_ARMCLCD for android.
- Fix global-out-of-bounds read in fbcon_get_font().
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/8585daa2-fcbc-3924-ac4f-e7b5668808e0@linux.intel.com
Diffstat (limited to 'drivers/video/fbdev/core/fbcon_rotate.c')
| -rw-r--r-- | drivers/video/fbdev/core/fbcon_rotate.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/fbdev/core/fbcon_rotate.c b/drivers/video/fbdev/core/fbcon_rotate.c index c0d445294aa7..ac72d4f85f7d 100644 --- a/drivers/video/fbdev/core/fbcon_rotate.c +++ b/drivers/video/fbdev/core/fbcon_rotate.c @@ -14,6 +14,7 @@ #include <linux/fb.h> #include <linux/vt_kern.h> #include <linux/console.h> +#include <linux/font.h> #include <asm/types.h> #include "fbcon.h" #include "fbcon_rotate.h" |