[PATCH] drivers/video/sis/init301.h: removal of old code

Signed-off-by: Michal Piotrowski <[email protected]>
Cc: "Antonino A. Daplas" <[email protected]>
Cc: Thomas Winischhofer <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/video/sis/init301.h b/drivers/video/sis/init301.h
index bc321dc57e92ebc1ceb4b70eadd1c2934c72fcf8..4f3a28699d3753ca7c48be541861ee6c1ca3950d 100644 (file)
--- 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] = {
   {