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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
video
/
sis
/
sis_main.c
diff --git
a/drivers/video/sis/sis_main.c
b/drivers/video/sis/sis_main.c
index
8adf5bf
..
895ebda
100644
(file)
--- a/
drivers/video/sis/sis_main.c
+++ b/
drivers/video/sis/sis_main.c
@@
-33,7
+33,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
#include <linux/version.h>
#include <linux/module.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
@@
-45,7
+44,13
@@
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
#include <linux/tty.h>
#include <linux/tty.h>
+#else
+#include <linux/screen_info.h>
+#endif
+
#include <linux/slab.h>
#include <linux/fb.h>
#include <linux/selection.h>
#include <linux/slab.h>
#include <linux/fb.h>
#include <linux/selection.h>
@@
-275,7
+280,7
@@
sisfb_search_mode(char *name, BOOLEAN quiet)
static void __devinit
sisfb_get_vga_mode_from_kernel(void)
{
static void __devinit
sisfb_get_vga_mode_from_kernel(void)
{
-#if
(defined(__i386__) || defined(__x86_64__)) && defined(CONFIG_VIDEO_SELECT)
+#if
def CONFIG_X86
char mymode[32];
int mydepth = screen_info.lfb_depth;
char mymode[32];
int mydepth = screen_info.lfb_depth;