Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6-omap-h63xx.git] / drivers / video / console / Kconfig

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 5fe182d6e4ab44bc09dc605b5980da37a915e67f..94c5f1392ccedb29ecb0dd1d37b31372976e121f 100644 (file)
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -28,7 +28,7 @@ config VGA_CONSOLE
 
 config VIDEO_SELECT
        bool "Video mode selection support"
 
 config VIDEO_SELECT
        bool "Video mode selection support"

-       depends on  (X86 || X86_64) && VGA_CONSOLE
+       depends on  X86 && VGA_CONSOLE

        ---help---
          This enables support for text mode selection on kernel startup. If
          you want to take advantage of some high-resolution text mode your
        ---help---
          This enables support for text mode selection on kernel startup. If
          you want to take advantage of some high-resolution text mode your


@@ -98,6 +98,18 @@ config FRAMEBUFFER_CONSOLE
        tristate "Framebuffer Console support"
        depends on FB
        select CRC32
        tristate "Framebuffer Console support"
        depends on FB
        select CRC32

+       help
+         Low-level framebuffer-based console driver.
+
+config FRAMEBUFFER_CONSOLE_ROTATION
+       bool "Framebuffer Console Rotation"
+       depends on FRAMEBUFFER_CONSOLE
+       help
+         Enable display rotation for the framebuffer console.  This is done
+         in software and may be significantly slower than a normally oriented
+         display.  Note that the rotation is done at the console level only
+         such that other users of the framebuffer will remain normally
+         oriented.

 
 config STI_CONSOLE
         tristate "STI text console" 
 
 config STI_CONSOLE
         tristate "STI text console" 


@@ -110,7 +122,7 @@ config STI_CONSOLE
 
 config FONTS
        bool "Select compiled-in fonts"
 
 config FONTS
        bool "Select compiled-in fonts"

-       depends on FRAMEBUFFER_CONSOLE
+       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.
        help
          Say Y here if you would like to use fonts other than the default
          your frame buffer console usually use.


@@ -123,7 +135,7 @@ config FONTS
 
 config FONT_8x8
        bool "VGA 8x8 font" if FONTS
 
 config FONT_8x8
        bool "VGA 8x8 font" if FONTS

-       depends on FRAMEBUFFER_CONSOLE
+       depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE

        default y if !SPARC32 && !SPARC64 && !FONTS
        help
          This is the "high resolution" font for the VGA frame buffer (the one
        default y if !SPARC32 && !SPARC64 && !FONTS
        help
          This is the "high resolution" font for the VGA frame buffer (the one


@@ -137,7 +149,7 @@ config FONT_8x8
 
 config FONT_8x16
        bool "VGA 8x16 font" if FONTS
 
 config FONT_8x16
        bool "VGA 8x16 font" if FONTS

-       depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y
+       depends on FRAMEBUFFER_CONSOLE || SGI_NEWPORT_CONSOLE=y || STI_CONSOLE || USB_SISUSBVGA_CON 

        default y if !SPARC32 && !SPARC64 && !FONTS
        help
          This is the "high resolution" font for the VGA frame buffer (the one
        default y if !SPARC32 && !SPARC64 && !FONTS
        help
          This is the "high resolution" font for the VGA frame buffer (the one


@@ -147,7 +159,7 @@ config FONT_8x16
 
 config FONT_6x11
        bool "Mac console 6x11 font (not supported by all drivers)" if FONTS
 
 config FONT_6x11
        bool "Mac console 6x11 font (not supported by all drivers)" if FONTS

-       depends on FRAMEBUFFER_CONSOLE
+       depends on FRAMEBUFFER_CONSOLE || STI_CONSOLE

        default y if !SPARC32 && !SPARC64 && !FONTS && MAC
        help
          Small console font with Macintosh-style high-half glyphs.  Some Mac
        default y if !SPARC32 && !SPARC64 && !FONTS && MAC
        help
          Small console font with Macintosh-style high-half glyphs.  Some Mac


@@ -203,5 +215,12 @@ config FONT_10x18
          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.
 
          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_RL
+       bool "console Roman Large 8x16 font" if FONTS
+       depends on FRAMEBUFFER_CONSOLE
+       help
+         This is the visually-appealing "RL" console font that is
+         included with the kbd package.
+

 endmenu
 
 endmenu