Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 6d22e54bedce911b2ffabca8cc88c41496820777

Authored by Helge Deller
Committed by Greg Kroah-Hartman
1 parent 130cfbeb76

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

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

... ... @@ -9,7 +9,7 @@
9 9  
10 10 config FONTS
11 11 bool "Select compiled-in fonts"
12   - depends on FRAMEBUFFER_CONSOLE
  12 + depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
13 13 help
14 14 Say Y here if you would like to use fonts other than the default
15 15 your frame buffer console usually use.
... ... @@ -22,7 +22,7 @@
22 22  
23 23 config FONT_8x8
24 24 bool "VGA 8x8 font" if FONTS
25   - depends on FRAMEBUFFER_CONSOLE
  25 + depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
26 26 default y if !SPARC && !FONTS
27 27 help
28 28 This is the "high resolution" font for the VGA frame buffer (the one
... ... @@ -45,7 +45,7 @@
45 45  
46 46 config FONT_6x11
47 47 bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
48   - depends on FRAMEBUFFER_CONSOLE
  48 + depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
49 49 default y if !SPARC && !FONTS && MAC
50 50 help
51 51 Small console font with Macintosh-style high-half glyphs. Some Mac