diff options
author | Adrian Bunk <bunk@stusta.de> | 2006-06-26 03:26:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 12:58:28 -0400 |
commit | 31c5cdba69c3c6e9bb1aaf15870f5c23402267e0 (patch) | |
tree | 091fe4832efd7d284fb4f4130097faa65a167d2c /drivers/video/Kconfig | |
parent | e4423781850025726b6c4e24ba3d93c7ff9cd826 (diff) |
[PATCH] fbdev: cleanup the CONFIG_VIDEO_SELECT mess
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>
Diffstat (limited to 'drivers/video/Kconfig')
-rw-r--r-- | drivers/video/Kconfig | 11 |
1 files changed, 0 insertions, 11 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 |