]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h
authorPeilin Ye <yepeilin.cs@gmail.com>
Thu, 24 Sep 2020 13:40:53 +0000 (09:40 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Oct 2020 07:46:21 +0000 (09:46 +0200)
commitca308ad621a8f0477140e39a8814d46041c843b8
treec21f8bf8e5f16febe0964a39f9bd9c731a6fc0de
parent3f5bfa0a2c3401bfbc0cab5894df8262de619641
fbdev, newport_con: Move FONT_EXTRA_WORDS macros into linux/font.h

commit bb0890b4cd7f8203e3aa99c6d0f062d6acdaad27 upstream.

drivers/video/console/newport_con.c is borrowing FONT_EXTRA_WORDS macros
from drivers/video/fbdev/core/fbcon.h. To keep things simple, move all
definitions into <linux/font.h>.

Since newport_con now uses four extra words, initialize the fourth word in
newport_set_font() properly.

Cc: stable@vger.kernel.org
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/7fb8bc9b0abc676ada6b7ac0e0bd443499357267.1600953813.git.yepeilin.cs@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/video/console/fbcon.h
drivers/video/console/fbcon_rotate.c
drivers/video/console/newport_con.c
drivers/video/console/tileblit.c
include/linux/font.h