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
/
osdef.h
diff --git
a/drivers/video/sis/osdef.h
b/drivers/video/sis/osdef.h
index
841ca31
..
d048bd3
100644
(file)
--- a/
drivers/video/sis/osdef.h
+++ b/
drivers/video/sis/osdef.h
@@
-90,7
+90,6
@@
/**********************************************************************/
#ifdef SIS_LINUX_KERNEL
/**********************************************************************/
#ifdef SIS_LINUX_KERNEL
-#include <linux/config.h>
#include <linux/version.h>
#ifdef CONFIG_FB_SIS_300
#include <linux/version.h>
#ifdef CONFIG_FB_SIS_300
@@
-101,11
+100,7
@@
#define SIS315H
#endif
#define SIS315H
#endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
#define SIS_LINUX_KERNEL_26
#define SIS_LINUX_KERNEL_26
-#else
-#define SIS_LINUX_KERNEL_24
-#endif
#if !defined(SIS300) && !defined(SIS315H)
#warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set
#if !defined(SIS300) && !defined(SIS315H)
#warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set