Commit 5ed5dc6c authored by Jurriaan on adsl-gate's avatar Jurriaan on adsl-gate Committed by Linus Torvalds

[PATCH] font selection Kconfig fixes

We're accidentally selecting the new fonts by default.  Don't.
Signed-off-by: default avatarJurriaan Kalkman <thunder7@xs4all.nl>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d7496cb7
...@@ -156,7 +156,6 @@ config FONT_6x11 ...@@ -156,7 +156,6 @@ config FONT_6x11
config FONT_7x14 config FONT_7x14
bool "console 7x14 font (not supported by all drivers)" if FONTS bool "console 7x14 font (not supported by all drivers)" if FONTS
depends on FRAMEBUFFER_CONSOLE depends on FRAMEBUFFER_CONSOLE
default y if !SPARC32 && !SPARC64 && !FONTS
help help
Console font with characters just a bit smaller than the default. Console font with characters just a bit smaller than the default.
If the standard 8x16 font is a little too big for you, say Y. If the standard 8x16 font is a little too big for you, say Y.
...@@ -197,8 +196,8 @@ config FONT_SUN12x22 ...@@ -197,8 +196,8 @@ config FONT_SUN12x22
standard font is unreadable for you, say Y, otherwise say N. standard font is unreadable for you, say Y, otherwise say N.
config FONT_10x18 config FONT_10x18
bool "console 10x18 font (not supported by all drivers)" bool "console 10x18 font (not supported by all drivers)" if FONTS
depends on FONTS depends on FRAMEBUFFER_CONSOLE
help help
This is a high resolution console font for machines with very This is a high resolution console font for machines with very
big letters. It fits between the sun 12x22 and the normal 8x16 font. big letters. It fits between the sun 12x22 and the normal 8x16 font.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment