1 files changed, 6 insertions, 110 deletions

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index bc922c47d046..8c30603e0a86 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -6,7 +6,9 @@ menu "Console display driver support"
 
 config VGA_CONSOLE
         bool "VGA text console" if EXPERT || !X86
-        depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER)
+        depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \
+                !SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \
+                (!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER)
         default y
         help
           Saying Y here will allow you to use Linux in text mode through a
@@ -62,6 +64,7 @@ config MDA_CONSOLE
 config SGI_NEWPORT_CONSOLE
         tristate "SGI Newport Console support"
         depends on SGI_IP22 
+        select FONT_SUPPORT
         help
           Say Y here if you want the console on the Newport aka XL graphics
           card of your Indy.  Most people say Y here.
@@ -91,6 +94,7 @@ config FRAMEBUFFER_CONSOLE
         tristate "Framebuffer Console support"
         depends on FB
         select CRC32
+        select FONT_SUPPORT
         help
           Low-level framebuffer-based console driver.
 
@@ -123,120 +127,12 @@ config FRAMEBUFFER_CONSOLE_ROTATION
 config STI_CONSOLE
         bool "STI text console"
         depends on PARISC
+        select FONT_SUPPORT
         default y
         help
           The STI console is the builtin display/keyboard on HP-PARISC
           machines.  Say Y here to build support for it into your kernel.
           The alternative is to use your primary serial port as a console.
 
-config FONTS
-        bool "Select compiled-in fonts"
-        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
-        help
-          Say Y here if you would like to use fonts other than the default
-          your frame buffer console usually use.
-
-          Note that the answer to this question won't directly affect the
-          kernel: saying N will just cause the configurator to skip all
-          the questions about foreign fonts.
-
-          If unsure, say N (the default choices are safe).
-
-config FONT_8x8
-        bool "VGA 8x8 font" if FONTS
-        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
-        default y if !SPARC && !FONTS
-        help
-          This is the "high resolution" font for the VGA frame buffer (the one
-          provided by the text console 80x50 (and higher) modes).
-
-          Note that this is a poor quality font. The VGA 8x16 font is quite a
-          lot more readable.
-
-          Given the resolution provided by the frame buffer device, answer N
-          here is safe.
-
-config FONT_8x16
-        bool "VGA 8x16 font" if FONTS
-        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE || STI_CONSOLE || USB_SISUSBVGA_CON
-        default y if !SPARC && !FONTS
-        help
-          This is the "high resolution" font for the VGA frame buffer (the one
-          provided by the VGA text console 80x25 mode.
-
-          If unsure, say Y.
-
-config FONT_6x11
-        bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
-        depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE
-        default y if !SPARC && !FONTS && MAC
-        help
-          Small console font with Macintosh-style high-half glyphs.  Some Mac
-          framebuffer drivers don't support this one at all.
-
-config FONT_7x14
-        bool "console 7x14 font (not supported by all drivers)" if FONTS
-        depends on FRAMEBUFFER_CONSOLE
-        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.
-          Otherwise, say N.
-
-config FONT_PEARL_8x8
-        bool "Pearl (old m68k) console 8x8 font" if FONTS
-        depends on FRAMEBUFFER_CONSOLE
-        default y if !SPARC && !FONTS && AMIGA
-        help
-          Small console font with PC-style control-character and high-half
-          glyphs.
-
-config FONT_ACORN_8x8
-        bool "Acorn console 8x8 font" if FONTS
-        depends on FRAMEBUFFER_CONSOLE
-        default y if !SPARC && !FONTS && ARM && ARCH_ACORN
-        help
-          Small console font with PC-style control characters and high-half
-          glyphs.
-
-config FONT_MINI_4x6
-        bool "Mini 4x6 font"
-        depends on !SPARC && FONTS
-
-config FONT_SUN8x16
-        bool "Sparc console 8x16 font"
-        depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
-        help
-          This is the high resolution console font for Sun machines. Say Y.
-
-config FONT_SUN12x22
-        bool "Sparc console 12x22 font (not supported by all drivers)"
-        depends on FRAMEBUFFER_CONSOLE && (!SPARC && FONTS || SPARC)
-        help
-          This is the high resolution console font for Sun machines with very
-          big letters (like the letters used in the SPARC PROM). If the
-          standard font is unreadable for you, say Y, otherwise say N.
-
-config FONT_10x18
-        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.
-          If other fonts are too big or too small for you, say Y, otherwise say N.
-
-config FONT_AUTOSELECT
-        def_bool y
-        depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE || STI_CONSOLE || USB_SISUSBVGA_CON
-        depends on !FONT_8x8
-        depends on !FONT_6x11
-        depends on !FONT_7x14
-        depends on !FONT_PEARL_8x8
-        depends on !FONT_ACORN_8x8
-        depends on !FONT_MINI_4x6
-        depends on !FONT_SUN8x16
-        depends on !FONT_SUN12x22
-        depends on !FONT_10x18
-        select FONT_8x16
-
 endmenu