git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
video
/
sis
/
init301.h
diff --git
a/drivers/video/sis/init301.h
b/drivers/video/sis/init301.h
index
bc321dc
..
4f3a286
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>
#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"
#include "sis.h"
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-#include <linux/sisfb.h>
-#else
#include <video/sisfb.h>
#endif
#include <video/sisfb.h>
#endif
-#endif
static const unsigned char SiS_YPbPrTable[3][64] = {
{
static const unsigned char SiS_YPbPrTable[3][64] = {
{