From 3222911e92ab3c96fdfaa5e5f31c4549f69e37dd Mon Sep 17 00:00:00 2001
From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Date: Tue, 3 Oct 2006 01:14:54 -0700
Subject: [PATCH] --- yaml --- r: 38061 b: refs/heads/master c:
 99dbb4641a820c777cb32d2907402525a6ab4015 h: refs/heads/master i:   38059:
 b3cbbd5ca8ece51a75c1f0442968cee14daac2fb v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/video/sis/init301.h | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 1881cc09979c..338e70856622 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9237ed0fef8d0373b39cc7884451d3c3e3bc8a2a
+refs/heads/master: 99dbb4641a820c777cb32d2907402525a6ab4015
diff --git a/trunk/drivers/video/sis/init301.h b/trunk/drivers/video/sis/init301.h
index bc321dc57e92..4f3a28699d37 100644
--- a/trunk/drivers/video/sis/init301.h
+++ b/trunk/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] = {
   {