diff options
-rw-r--r-- | arch/x86/configs/i386_defconfig | 1 | ||||
-rw-r--r-- | arch/x86/configs/x86_64_defconfig | 1 | ||||
-rw-r--r-- | drivers/video/Kconfig | 2 | ||||
-rw-r--r-- | drivers/video/console/Kconfig | 16 |
4 files changed, 0 insertions, 20 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 9bc34e2033ec..a7ae4385670e 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
@@ -1482,7 +1482,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y | |||
1482 | CONFIG_VGA_CONSOLE=y | 1482 | CONFIG_VGA_CONSOLE=y |
1483 | CONFIG_VGACON_SOFT_SCROLLBACK=y | 1483 | CONFIG_VGACON_SOFT_SCROLLBACK=y |
1484 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | 1484 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 |
1485 | CONFIG_VIDEO_SELECT=y | ||
1486 | CONFIG_DUMMY_CONSOLE=y | 1485 | CONFIG_DUMMY_CONSOLE=y |
1487 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | 1486 | # CONFIG_FRAMEBUFFER_CONSOLE is not set |
1488 | CONFIG_LOGO=y | 1487 | CONFIG_LOGO=y |
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index ae5124e064d4..743e80392731 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -1449,7 +1449,6 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y | |||
1449 | CONFIG_VGA_CONSOLE=y | 1449 | CONFIG_VGA_CONSOLE=y |
1450 | CONFIG_VGACON_SOFT_SCROLLBACK=y | 1450 | CONFIG_VGACON_SOFT_SCROLLBACK=y |
1451 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | 1451 | CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 |
1452 | CONFIG_VIDEO_SELECT=y | ||
1453 | CONFIG_DUMMY_CONSOLE=y | 1452 | CONFIG_DUMMY_CONSOLE=y |
1454 | # CONFIG_FRAMEBUFFER_CONSOLE is not set | 1453 | # CONFIG_FRAMEBUFFER_CONSOLE is not set |
1455 | CONFIG_LOGO=y | 1454 | CONFIG_LOGO=y |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 9b887ef64ff1..d58509a67068 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -678,7 +678,6 @@ config FB_VESA | |||
678 | select FB_CFB_FILLRECT | 678 | select FB_CFB_FILLRECT |
679 | select FB_CFB_COPYAREA | 679 | select FB_CFB_COPYAREA |
680 | select FB_CFB_IMAGEBLIT | 680 | select FB_CFB_IMAGEBLIT |
681 | select VIDEO_SELECT | ||
682 | help | 681 | help |
683 | This is the frame buffer device driver for generic VESA 2.0 | 682 | This is the frame buffer device driver for generic VESA 2.0 |
684 | compliant graphic cards. The older VESA 1.2 cards are not supported. | 683 | compliant graphic cards. The older VESA 1.2 cards are not supported. |
@@ -1583,7 +1582,6 @@ config FB_CYBLA | |||
1583 | tristate "Cyberblade/i1 support" | 1582 | tristate "Cyberblade/i1 support" |
1584 | depends on FB && PCI && X86_32 && !64BIT | 1583 | depends on FB && PCI && X86_32 && !64BIT |
1585 | select FB_CFB_IMAGEBLIT | 1584 | select FB_CFB_IMAGEBLIT |
1586 | select VIDEO_SELECT | ||
1587 | ---help--- | 1585 | ---help--- |
1588 | This driver is supposed to support the Trident Cyberblade/i1 | 1586 | This driver is supposed to support the Trident Cyberblade/i1 |
1589 | graphics core integrated in the VIA VT8601A North Bridge, | 1587 | graphics core integrated in the VIA VT8601A North Bridge, |
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig index 06f87b04f207..2f50a80b413e 100644 --- a/drivers/video/console/Kconfig +++ b/drivers/video/console/Kconfig | |||
@@ -43,22 +43,6 @@ config VGACON_SOFT_SCROLLBACK_SIZE | |||
43 | buffer. Each 64KB will give you approximately 16 80x25 | 43 | buffer. Each 64KB will give you approximately 16 80x25 |
44 | screenfuls of scrollback buffer | 44 | screenfuls of scrollback buffer |
45 | 45 | ||
46 | config VIDEO_SELECT | ||
47 | bool "Video mode selection support" | ||
48 | depends on X86 && VGA_CONSOLE | ||
49 | ---help--- | ||
50 | This enables support for text mode selection on kernel startup. If | ||
51 | you want to take advantage of some high-resolution text mode your | ||
52 | card's BIOS offers, but the traditional Linux utilities like | ||
53 | SVGATextMode don't, you can say Y here and set the mode using the | ||
54 | "vga=" option from your boot loader (lilo or loadlin) or set | ||
55 | "vga=ask" which brings up a video mode menu on kernel startup. (Try | ||
56 | "man bootparam" or see the documentation of your boot loader about | ||
57 | how to pass options to the kernel.) | ||
58 | |||
59 | Read the file <file:Documentation/svga.txt> for more information | ||
60 | about the Video mode selection support. If unsure, say N. | ||
61 | |||
62 | config MDA_CONSOLE | 46 | config MDA_CONSOLE |
63 | depends on !M68K && !PARISC && ISA | 47 | depends on !M68K && !PARISC && ISA |
64 | tristate "MDA text console (dual-headed) (EXPERIMENTAL)" | 48 | tristate "MDA text console (dual-headed) (EXPERIMENTAL)" |