From: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Date: Tue, 3 Oct 2006 08:14:56 +0000 (-0700)
Subject: [PATCH] drivers/video/sis/init.h: removal of old code
X-Git-Tag: v2.6.19-rc1~300
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=db3affc0b256162a957253b4eaedb202885bb38d;p=~shefty%2Frdma-dev.git

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

Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h
index 7ecab87cef0..59d12844b4d 100644
--- a/drivers/video/sis/init.h
+++ b/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};