* [2.6 patch] cleanup the CONFIG_VIDEO_SELECT mess
@ 2006-04-15 11:56 Adrian Bunk
0 siblings, 0 replies; only message in thread
From: Adrian Bunk @ 2006-04-15 11:56 UTC (permalink / raw)
To: linux-kernel; +Cc: adaplas, linux-fbdev-devel, ak, discuss, thomas
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>
---
drivers/video/Kconfig | 11 -----------
drivers/video/sis/sis_main.c | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
--- linux-2.6.17-rc1-mm2-full/drivers/video/Kconfig.old 2006-04-15 13:37:49.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/drivers/video/Kconfig 2006-04-15 13:38:07.000000000 +0200
@@ -481,11 +481,6 @@
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
@@ -508,12 +503,6 @@
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
--- linux-2.6.17-rc1-mm2-full/drivers/video/sis/sis_main.c.old 2006-04-15 13:38:41.000000000 +0200
+++ linux-2.6.17-rc1-mm2-full/drivers/video/sis/sis_main.c 2006-04-15 13:39:13.000000000 +0200
@@ -275,7 +275,7 @@
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;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2006-04-15 11:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-15 11:56 [2.6 patch] cleanup the CONFIG_VIDEO_SELECT mess Adrian Bunk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).