Skip to content

Commit

Permalink
[PATCH] fbdev: cleanup the CONFIG_VIDEO_SELECT mess
Browse files Browse the repository at this point in the history
We had three (sic) VIDEO_SELECT options:
- two in drivers/video/Kconfig
- one in drivers/video/console/Kconfig

This patch removes the two options in drivers/video/Kconfig and also removes
the unneeded usage in drivers/video/sis/sis_main.c .

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Jun 26, 2006
1 parent e442378 commit 31c5cdb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
11 changes: 0 additions & 11 deletions drivers/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -551,11 +551,6 @@ config FB_VESA
You will get a boot time penguin logo at no additional cost. Please
read <file:Documentation/fb/vesafb.txt>. If unsure, say Y.

config VIDEO_SELECT
bool
depends on FB_VESA
default y

config FB_HGA
tristate "Hercules mono graphics support"
depends on FB && X86
Expand All @@ -578,12 +573,6 @@ config FB_HGA_ACCEL
This will compile the Hercules mono graphics with
acceleration functions.


config VIDEO_SELECT
bool
depends on (FB = y) && X86
default y

config FB_SGIVW
tristate "SGI Visual Workstation framebuffer support"
depends on FB && X86_VISWS
Expand Down
2 changes: 1 addition & 1 deletion drivers/video/sis/sis_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ sisfb_search_mode(char *name, BOOLEAN quiet)
static void __devinit
sisfb_get_vga_mode_from_kernel(void)
{
#if (defined(__i386__) || defined(__x86_64__)) && defined(CONFIG_VIDEO_SELECT)
#ifdef CONFIG_X86
char mymode[32];
int mydepth = screen_info.lfb_depth;

Expand Down

0 comments on commit 31c5cdb

Please sign in to comment.