summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-07-12 18:34:11 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-07-14 23:35:58 (EDT)
commit3914bcf2f706427f0acc817a37de2ae8e6ee0b30 (patch)
treeef67381e141910f73f22ea5483296a8fa38d0434
parent75af1eb87897df0f79d7ee125c87730bf5b3e361 (diff)
patches: Fix M+ *_IDX macros in <linux/font.h>
-rw-r--r--patches/01_add-mplus-fonts.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/01_add-mplus-fonts.patch b/patches/01_add-mplus-fonts.patch
index 5bcab22..1e1b46d 100644
--- a/patches/01_add-mplus-fonts.patch
+++ b/patches/01_add-mplus-fonts.patch
@@ -25,17 +25,17 @@ bdf2fbcon: <http://git.proteanos.com/bdf2fbcon/bdf2fbcon.git/>
diff -Naurp src.orig/include/linux/font.h src/include/linux/font.h
--- src.orig/include/linux/font.h 2019-06-24 23:36:02.000000000 -0400
-+++ src/include/linux/font.h 2019-06-30 00:26:35.796694940 -0400
++++ src/include/linux/font.h 2019-07-12 18:18:18.382494509 -0400
@@ -32,6 +32,12 @@ struct font_desc {
#define ACORN8x8_IDX 8
#define MINI4x6_IDX 9
#define FONT6x10_IDX 10
-+#define FONT_MPLUS_1M_REGULAR_8X12 11
-+#define FONT_MPLUS_1M_REGULAR_10X14 12
-+#define FONT_MPLUS_1M_REGULAR_12X17 13
-+#define FONT_MPLUS_1M_REGULAR_16X22 14
-+#define FONT_MPLUS_1M_REGULAR_24X34 15
-+#define FONT_MPLUS_1M_REGULAR_32X44 16
++#define MPLUS_1M_REGULAR_8x12_IDX 11
++#define MPLUS_1M_REGULAR_10x14_IDX 12
++#define MPLUS_1M_REGULAR_12x17_IDX 13
++#define MPLUS_1M_REGULAR_16x22_IDX 14
++#define MPLUS_1M_REGULAR_24x34_IDX 15
++#define MPLUS_1M_REGULAR_32x44_IDX 16
extern const struct font_desc font_vga_8x8,
font_vga_8x16,