diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2020-11-10 19:11:37 +0300 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2020-11-10 19:11:37 +0300 |
| commit | 112e505a76de69f8667e2fe8da38433f754364a8 (patch) | |
| tree | 75fba3a00d8c093604f83bdd8a3c3c1e0b94f823 /lib/fonts/font_sun12x22.c | |
| parent | 55c8bcaeccaa5c6d9e7a432ebd0a1717f488a3f4 (diff) | |
| parent | 512bce50a41c528fa15c4c014293e7bebf018658 (diff) | |
| download | linux-112e505a76de69f8667e2fe8da38433f754364a8.tar.xz | |
Merge drm/drm-next into drm-misc-next
We need commit f8f6ae5d077a ("mm: always have io_remap_pfn_range() set
pgprot_decrypted()") to be able to merge Jason's cleanup patch.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'lib/fonts/font_sun12x22.c')
| -rw-r--r-- | lib/fonts/font_sun12x22.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fonts/font_sun12x22.c b/lib/fonts/font_sun12x22.c index 641a6b4dca42..a5b65bd49604 100644 --- a/lib/fonts/font_sun12x22.c +++ b/lib/fonts/font_sun12x22.c @@ -3,7 +3,7 @@ #define FONTDATAMAX 11264 -static struct font_data fontdata_sun12x22 = { +static const struct font_data fontdata_sun12x22 = { { 0, 0, FONTDATAMAX, 0 }, { /* 0 0x00 '^@' */ 0x00, 0x00, /* 000000000000 */ |