Merge tag 'v3.18-rc4' into x86/cleanups, to refresh the tree before pulling new changes.

[cascardo/linux.git] / lib / fonts / Kconfig

diff --git a/lib/fonts/Kconfig b/lib/fonts/Kconfig
index 34fd931..e77dfe0 100644 (file)
--- a/lib/fonts/Kconfig
+++ b/lib/fonts/Kconfig
@@ -79,6 +79,14 @@ config FONT_MINI_4x6
        bool "Mini 4x6 font"
        depends on !SPARC && FONTS
 
+config FONT_6x10
+       bool "Medium-size 6x10 font"
+       depends on !SPARC && FONTS
+       help
+         Medium-size console font. Suitable for framebuffer consoles on
+         embedded devices with a 320x240 screen, to get a reasonable number
+         of characters (53x24) that are still at a readable size.
+
 config FONT_SUN8x16
        bool "Sparc console 8x16 font"
        depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
@@ -109,6 +117,7 @@ config FONT_AUTOSELECT
        depends on !FONT_PEARL_8x8
        depends on !FONT_ACORN_8x8
        depends on !FONT_MINI_4x6
+       depends on !FONT_6x10
        depends on !FONT_SUN8x16
        depends on !FONT_SUN12x22
        depends on !FONT_10x18