diff options
-rw-r--r-- | drivers/video/Kconfig | 11 | ||||
-rw-r--r-- | drivers/video/sis/sis_main.c | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 168ede7902bd..90cd5587d4e3 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -551,11 +551,6 @@ config FB_VESA | |||
551 | You will get a boot time penguin logo at no additional cost. Please | 551 | You will get a boot time penguin logo at no additional cost. Please |
552 | read <file:Documentation/fb/vesafb.txt>. If unsure, say Y. | 552 | read <file:Documentation/fb/vesafb.txt>. If unsure, say Y. |
553 | 553 | ||
554 | config VIDEO_SELECT | ||
555 | bool | ||
556 | depends on FB_VESA | ||
557 | default y | ||
558 | |||
559 | config FB_HGA | 554 | config FB_HGA |
560 | tristate "Hercules mono graphics support" | 555 | tristate "Hercules mono graphics support" |
561 | depends on FB && X86 | 556 | depends on FB && X86 |
@@ -578,12 +573,6 @@ config FB_HGA_ACCEL | |||
578 | This will compile the Hercules mono graphics with | 573 | This will compile the Hercules mono graphics with |
579 | acceleration functions. | 574 | acceleration functions. |
580 | 575 | ||
581 | |||
582 | config VIDEO_SELECT | ||
583 | bool | ||
584 | depends on (FB = y) && X86 | ||
585 | default y | ||
586 | |||
587 | config FB_SGIVW | 576 | config FB_SGIVW |
588 | tristate "SGI Visual Workstation framebuffer support" | 577 | tristate "SGI Visual Workstation framebuffer support" |
589 | depends on FB && X86_VISWS | 578 | depends on FB && X86_VISWS |
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 8adf5bf91eee..c63c0e721b82 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
@@ -275,7 +275,7 @@ sisfb_search_mode(char *name, BOOLEAN quiet) | |||
275 | static void __devinit | 275 | static void __devinit |
276 | sisfb_get_vga_mode_from_kernel(void) | 276 | sisfb_get_vga_mode_from_kernel(void) |
277 | { | 277 | { |
278 | #if (defined(__i386__) || defined(__x86_64__)) && defined(CONFIG_VIDEO_SELECT) | 278 | #ifdef CONFIG_X86 |
279 | char mymode[32]; | 279 | char mymode[32]; |
280 | int mydepth = screen_info.lfb_depth; | 280 | int mydepth = screen_info.lfb_depth; |
281 | 281 | ||