aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorMichal Piotrowski <michal.k.k.piotrowski@gmail.com>2006-10-03 04:14:56 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 11:04:11 -0400
commitdb3affc0b256162a957253b4eaedb202885bb38d (patch)
tree6ac889e33f6008c31c687529a55f86a563744a0f /drivers/video
parentf8e3d4c19c1b81a8d1bf7ea709524ab8fc2186c3 (diff)
[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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/sis/init.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/video/sis/init.h b/drivers/video/sis/init.h
index 7ecab87cef02..59d12844b4dd 100644
--- a/drivers/video/sis/init.h
+++ b/drivers/video/sis/init.h
@@ -77,16 +77,9 @@
77#include <linux/types.h> 77#include <linux/types.h>
78#include <asm/io.h> 78#include <asm/io.h>
79#include <linux/fb.h> 79#include <linux/fb.h>
80#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
81#include <video/fbcon.h>
82#endif
83#include "sis.h" 80#include "sis.h"
84#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
85#include <linux/sisfb.h>
86#else
87#include <video/sisfb.h> 81#include <video/sisfb.h>
88#endif 82#endif
89#endif
90 83
91/* Mode numbers */ 84/* Mode numbers */
92static const unsigned short ModeIndex_320x200[] = {0x59, 0x41, 0x00, 0x4f}; 85static const unsigned short ModeIndex_320x200[] = {0x59, 0x41, 0x00, 0x4f};