---

yaml --- r: 38061 b: refs/heads/master c: 99dbb46 h: refs/heads/master i: 38059: b3cbbd5 v: v3
git-mirror · Oct 3, 2006 · 3222911 · 3222911
1 parent a9c3174
commit 3222911
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git 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
@@ -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] = {
   {