tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

authored by

Jurriaan on adsl-gate and committed by
Linus Torvalds 5ed5dc6c d7496cb7

+2 -3
unified split
+2 -3
drivers/video/console/Kconfig
··· 156 156 config FONT_7x14 157 157 bool "console 7x14 font (not supported by all drivers)" if FONTS 158 158 depends on FRAMEBUFFER_CONSOLE 159 - default y if !SPARC32 && !SPARC64 && !FONTS 160 159 help 161 160 Console font with characters just a bit smaller than the default. 162 161 If the standard 8x16 font is a little too big for you, say Y. ··· 196 197 standard font is unreadable for you, say Y, otherwise say N. 197 198 198 199 config FONT_10x18 199 - bool "console 10x18 font (not supported by all drivers)" 200 - depends on FONTS 200 + bool "console 10x18 font (not supported by all drivers)" if FONTS 201 + depends on FRAMEBUFFER_CONSOLE 201 202 help 202 203 This is a high resolution console font for machines with very 203 204 big letters. It fits between the sun 12x22 and the normal 8x16 font.