git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From a2fb4d782c61f77480e586578eeb4dfd27d134ea Mon Sep 17 00:00:00 2001
   2 From: Helge Deller <deller@gmx.de>
   3 Date: Sun, 23 Mar 2014 16:39:52 +0100
   4 Subject: partly revert commit 8a10bc9: parisc/sti_console: prefer Linux fonts over built-in ROM fonts
   5
   6 From: Helge Deller <deller@gmx.de>
   7
   8 commit a2fb4d782c61f77480e586578eeb4dfd27d134ea upstream.
   9
  10 STI console is used on parisc and m68k HP machines. This patch partly reverts
  11 my previous commit and as such restores the fonts for the m68k machines.
  12
  13 Signed-off-by: Helge Deller <deller@gmx.de>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  15
  16 ---
  17  lib/fonts/Kconfig |    6 +++---
  18  1 file changed, 3 insertions(+), 3 deletions(-)
  19
  20 --- a/lib/fonts/Kconfig
  21 +++ b/lib/fonts/Kconfig
  22 @@ -9,7 +9,7 @@ if FONT_SUPPORT
  23
  24  config FONTS
  25         bool "Select compiled-in fonts"
  26 -       depends on FRAMEBUFFER_CONSOLE
  27 +       depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
  28         help
  29           Say Y here if you would like to use fonts other than the default
  30           your frame buffer console usually use.
  31 @@ -22,7 +22,7 @@ config FONTS
  32
  33  config FONT_8x8
  34         bool "VGA 8x8 font" if FONTS
  35 -       depends on FRAMEBUFFER_CONSOLE
  36 +       depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
  37         default y if !SPARC && !FONTS
  38         help
  39           This is the "high resolution" font for the VGA frame buffer (the one
  40 @@ -45,7 +45,7 @@ config FONT_8x16
  41
  42  config FONT_6x11
  43         bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
  44 -       depends on FRAMEBUFFER_CONSOLE
  45 +       depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
  46         default y if !SPARC && !FONTS && MAC
  47         help
  48           Small console font with Macintosh-style high-half glyphs.  Some Mac