---

yaml --- r: 38063 b: refs/heads/master c: db3affc h: refs/heads/master i: 38061: 3222911 38059: b3cbbd5 38055: 9783419 38047: 2b42231 v: v3
git-mirror · Oct 3, 2006 · 5999a51 · 5999a51
1 parent 3cc57d0
commit 5999a51
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: f8e3d4c19c1b81a8d1bf7ea709524ab8fc2186c3
+refs/heads/master: db3affc0b256162a957253b4eaedb202885bb38d
diff --git 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};