From 5999a518ef5cf64a3bab17e749d68642595d203b Mon Sep 17 00:00:00 2001
From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Date: Tue, 3 Oct 2006 01:14:56 -0700
Subject: [PATCH] --- yaml --- r: 38063 b: refs/heads/master c:
 db3affc0b256162a957253b4eaedb202885bb38d h: refs/heads/master i:   38061:
 3222911e92ab3c96fdfaa5e5f31c4549f69e37dd   38059:
 b3cbbd5ca8ece51a75c1f0442968cee14daac2fb   38055:
 9783419546749e53efabcaf95162ff22727945b5   38047:
 2b422313548164c4e5164f3852d33f39424d6864 v: v3

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

diff --git a/[refs] b/[refs]
index 9cd2efa2b6c4..bbfd2f12dd42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8e3d4c19c1b81a8d1bf7ea709524ab8fc2186c3
+refs/heads/master: db3affc0b256162a957253b4eaedb202885bb38d
diff --git a/trunk/drivers/video/sis/init.h b/trunk/drivers/video/sis/init.h
index 7ecab87cef02..59d12844b4dd 100644
--- a/trunk/drivers/video/sis/init.h
+++ b/trunk/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};