diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-08 15:44:50 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-08 15:44:50 -0700 |
| commit | 9d49aea13f1e35869158abe7e314e16dc8f50ff1 (patch) | |
| tree | c878d774db35fdb9834621e2f354973dc09f2702 /lib/fonts/font_mini_4x6.c | |
| parent | 9faebeb2d80065926dfbc09cb73b1bb7779a89cd (diff) | |
| parent | 3fdd47c3b40ac48e6e6e5904cf24d12e6e073a96 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Small conflict around locking in rxrpc_process_event() -
channel_lock moved to bundle in next, while state lock
needs _bh() from net.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'lib/fonts/font_mini_4x6.c')
| -rw-r--r-- | lib/fonts/font_mini_4x6.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/fonts/font_mini_4x6.c b/lib/fonts/font_mini_4x6.c index 838caa1cfef7..1449876c6a27 100644 --- a/lib/fonts/font_mini_4x6.c +++ b/lib/fonts/font_mini_4x6.c @@ -43,8 +43,8 @@ __END__; #define FONTDATAMAX 1536 -static const unsigned char fontdata_mini_4x6[FONTDATAMAX] = { - +static struct font_data fontdata_mini_4x6 = { + { 0, 0, FONTDATAMAX, 0 }, { /*{*/ /* Char 0: ' ' */ 0xee, /*= [*** ] */ @@ -2145,14 +2145,14 @@ static const unsigned char fontdata_mini_4x6[FONTDATAMAX] = { 0xee, /*= [*** ] */ 0x00, /*= [ ] */ /*}*/ -}; +} }; const struct font_desc font_mini_4x6 = { .idx = MINI4x6_IDX, .name = "MINI4x6", .width = 4, .height = 6, - .data = fontdata_mini_4x6, + .data = fontdata_mini_4x6.data, .pref = 3, }; |