From: Helge Deller Date: Sun, 23 Mar 2014 15:39:52 +0000 (+0100) Subject: partly revert commit 8a10bc9: parisc/sti_console: prefer Linux fonts over built-in... X-Git-Tag: v3.13.8~39 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d22e54bedce911b2ffabca8cc88c41496820777;p=thirdparty%2Fkernel%2Fstable.git partly revert commit 8a10bc9: parisc/sti_console: prefer Linux fonts over built-in ROM fonts commit a2fb4d782c61f77480e586578eeb4dfd27d134ea upstream. 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: Helge Deller Signed-off-by: Greg Kroah-Hartman --- diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig index 4dc1b990aa233..34fd931b54b53 100644 --- a/lib/fonts/Kconfig +++ b/lib/fonts/Kconfig @@ -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