summaryrefslogtreecommitdiffstats
path: root/drivers/video/sis
diff options
context:
space:
mode:
authorMichal Piotrowski <michal.k.k.piotrowski@gmail.com>2006-10-03 10:14:56 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 17:04:11 +0200
commitdb3affc0b256162a957253b4eaedb202885bb38d (patch)
tree6ac889e33f6008c31c687529a55f86a563744a0f /drivers/video/sis
parent[PATCH] drivers/video/sis/initextlfb.c: removal of old code (diff)
downloadlinux-db3affc0b256162a957253b4eaedb202885bb38d.tar.xz
linux-db3affc0b256162a957253b4eaedb202885bb38d.zip
[PATCH] drivers/video/sis/init.h: removal of old code
Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Cc: Thomas Winischhofer <thomas@winischhofer.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/init.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h
index 7ecab87cef02..59d12844b4dd 100644
--- a/drivers/video/sis/init.h
+++ b/drivers/video/sis/init.h
@@ -77,16 +77,9 @@
#include <linux/types.h>
#include <asm/io.h>
#include <linux/fb.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <video/fbcon.h>
-#endif
#include "sis.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <linux/sisfb.h>
-#else
#include <video/sisfb.h>
#endif
-#endif
/* Mode numbers */
static const unsigned short ModeIndex_320x200[] = {0x59, 0x41, 0x00, 0x4f};