Browse Source

[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>
Jurriaan on adsl-gate 20 years ago
parent
commit
5ed5dc6cb4
1 changed files with 2 additions and 3 deletions
  1. 2 3
      drivers/video/console/Kconfig

+ 2 - 3
drivers/video/console/Kconfig

@@ -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
 	  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)"
-	depends on FONTS
+	bool "console 10x18 font (not supported by all drivers)" if 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.