iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] fbdev: cleanup the CONFIG_VIDEO_SELECT mess

Browse Source 
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>
This commit is contained in:
Adrian Bunk 2006-06-26 00:26:28 -07:00 committed by Linus Torvalds
parent e442378185
commit 31c5cdba69
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/video/Kconfig
View File

@ -551,11 +551,6 @@ config FB_VESA
You will get a boot time penguin logo at no additional cost. Please You will get a boot time penguin logo at no additional cost. Please
read <file:Documentation/fb/vesafb.txt>. If unsure, say Y. read <file:Documentation/fb/vesafb.txt>. If unsure, say Y.
config VIDEO_SELECT
bool
depends on FB_VESA
default y
config FB_HGA config FB_HGA
tristate "Hercules mono graphics support" tristate "Hercules mono graphics support"
depends on FB && X86 depends on FB && X86
@ -578,12 +573,6 @@ config FB_HGA_ACCEL
This will compile the Hercules mono graphics with This will compile the Hercules mono graphics with
acceleration functions. acceleration functions.
config VIDEO_SELECT
bool
depends on (FB = y) && X86
default y
config FB_SGIVW config FB_SGIVW
tristate "SGI Visual Workstation framebuffer support" tristate "SGI Visual Workstation framebuffer support"
depends on FB && X86_VISWS depends on FB && X86_VISWS

2
drivers/video/sis/sis_main.c
View File

@ -275,7 +275,7 @@ sisfb_search_mode(char *name, BOOLEAN quiet)
static void __devinit static void __devinit
sisfb_get_vga_mode_from_kernel(void) sisfb_get_vga_mode_from_kernel(void)
{ {
#if (defined(__i386__) || defined(__x86_64__)) && defined(CONFIG_VIDEO_SELECT) #ifdef CONFIG_X86
char mymode[32]; char mymode[32];
int mydepth = screen_info.lfb_depth; int mydepth = screen_info.lfb_depth;