diff options
| author | Adrian Bunk | 2006-06-26 09:26:28 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-06-26 18:58:28 +0200 |
| commit | 31c5cdba69c3c6e9bb1aaf15870f5c23402267e0 (patch) | |
| tree | 091fe4832efd7d284fb4f4130097faa65a167d2c /drivers/video/sis | |
| parent | [PATCH] backlight: LOCOMO Backlight Driver updates (diff) | |
| download | kernel-qcow2-linux-31c5cdba69c3c6e9bb1aaf15870f5c23402267e0.tar.gz kernel-qcow2-linux-31c5cdba69c3c6e9bb1aaf15870f5c23402267e0.tar.xz kernel-qcow2-linux-31c5cdba69c3c6e9bb1aaf15870f5c23402267e0.zip | |
[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/sis')
| -rw-r--r-- | drivers/video/sis/sis_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) 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; |