Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2fb4d78 authored by Helge Deller's avatar Helge Deller
Browse files

partly revert commit 8a10bc9d: parisc/sti_console: prefer Linux fonts over built-in ROM fonts 



STI console is used on parisc and m68k HP machines. This patch partly reverts
my previous commit and as such restores the fonts for the m68k machines.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # v3.13
parent 774868c7

lib/fonts/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ if FONT_SUPPORT 


config FONTS

	bool "Select compiled-in fonts"

	depends on FRAMEBUFFER_CONSOLE

	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE

	help

	  Say Y here if you would like to use fonts other than the default

	  your frame buffer console usually use.
@@ -22,7 +22,7 @@ config FONTS 


config FONT_8x8

	bool "VGA 8x8 font" if FONTS

	depends on FRAMEBUFFER_CONSOLE

	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE

	default y if !SPARC && !FONTS

	help

	  This is the "high resolution" font for the VGA frame buffer (the one
@@ -45,7 +45,7 @@ config FONT_8x16 


config FONT_6x11

	bool "Mac console 6x11 font (not supported by all drivers)" if FONTS

	depends on FRAMEBUFFER_CONSOLE

	depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE

	default y if !SPARC && !FONTS && MAC

	help

	  Small console font with Macintosh-style high-half glyphs.  Some Mac