aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sis/init301.h
diff options
context:
space:
mode:
authorMichal Piotrowski <michal.k.k.piotrowski@gmail.com>2006-10-03 01:14:54 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 08:04:11 -0700
commit99dbb4641a820c777cb32d2907402525a6ab4015 (patch)
tree0cdab123eca89b0c9bb73e03b1f648259c54dcb5 /drivers/video/sis/init301.h
parent[PATCH] i810fb: Honor the return value of pci_enable_device (diff)
downloadlinux-dev-99dbb4641a820c777cb32d2907402525a6ab4015.tar.xz
linux-dev-99dbb4641a820c777cb32d2907402525a6ab4015.zip
[PATCH] drivers/video/sis/init301.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/init301.h')
-rw-r--r--drivers/video/sis/init301.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h
index bc321dc57e92..4f3a28699d37 100644
--- a/drivers/video/sis/init301.h
+++ b/drivers/video/sis/init301.h
@@ -71,16 +71,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
static const unsigned char SiS_YPbPrTable[3][64] = {
{