lkml.org 
[lkml]   [2014]   [Mar]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 08/46] partly revert commit 8a10bc9: parisc/sti_console: prefer Linux fonts over built-in ROM fonts
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Helge Deller <deller@gmx.de>

    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 <deller@gmx.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    lib/fonts/Kconfig | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- 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



    \
     
     \ /
      Last update: 2014-03-28 20:21    [W:4.142 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site