Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

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

diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index b87ed37ac0c1217c93a14638d0fd73b0d56a04bf..2f50a80b413e07910e64c49598284f9361810728 100644 (file)
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -6,7 +6,7 @@ menu "Console display driver support"
 
 config VGA_CONSOLE
        bool "VGA text console" if EMBEDDED || !X86
-       depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH && !BLACKFIN
+       depends on !ARCH_ACORN && !ARCH_EBSA110 && !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && !ARCH_VERSATILE && !SUPERH && !BLACKFIN && !AVR32 && !MN10300
        default y
        help
          Saying Y here will allow you to use Linux in text mode through a
@@ -43,22 +43,6 @@ config VGACON_SOFT_SCROLLBACK_SIZE
         buffer.  Each 64KB will give you approximately 16 80x25
         screenfuls of scrollback buffer
 
-config VIDEO_SELECT
-       bool "Video mode selection support"
-       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
-         card's BIOS offers, but the traditional Linux utilities like
-         SVGATextMode don't, you can say Y here and set the mode using the
-         "vga=" option from your boot loader (lilo or loadlin) or set
-         "vga=ask" which brings up a video mode menu on kernel startup. (Try
-         "man bootparam" or see the documentation of your boot loader about
-         how to pass options to the kernel.)
-
-         Read the file <file:Documentation/svga.txt> for more information
-         about the Video mode selection support. If unsure, say N.
-
 config MDA_CONSOLE
        depends on !M68K && !PARISC && ISA
        tristate "MDA text console (dual-headed) (EXPERIMENTAL)"