summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJurriaan on adsl-gate <thunder7@xs4all.nl>2005-06-25 14:58:31 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 16:24:55 -0700
commit5ed5dc6cb40b163aa19e14eda0957dcc09167b80 (patch)
treeab4d291efbf657b7f8a2b203a01bdfb0d15af4fb
parentd7496cb75ec75b1e74283a481fb02f5d7ce7bdeb (diff)
downloadlinux-5ed5dc6cb40b163aa19e14eda0957dcc09167b80.tar.bz2
[PATCH] font selection Kconfig fixes
We're accidentally selecting the new fonts by default. Don't. Signed-off-by: Jurriaan Kalkman <thunder7@xs4all.nl> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/video/console/Kconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index e4b91a4b936c..cbff98337aa6 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -156,7 +156,6 @@ config FONT_6x11
config FONT_7x14
bool "console 7x14 font (not supported by all drivers)" if FONTS
depends on FRAMEBUFFER_CONSOLE
- default y if !SPARC32 && !SPARC64 && !FONTS
help
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.
@@ -197,8 +196,8 @@ config FONT_SUN12x22
standard font is unreadable for you, say Y, otherwise say N.
config FONT_10x18
- bool "console 10x18 font (not supported by all drivers)"
- depends on FONTS
+ bool "console 10x18 font (not supported by all drivers)" if FONTS
+ depends on FRAMEBUFFER_CONSOLE
help
This is a high resolution console font for machines with very
big letters. It fits between the sun 12x22 and the normal 8x16 font.