Fix sisfb header location for 2.6 kernels

Submitted by: Andrew Morton

diff --git a/shared-core/sis_mm.c b/shared-core/sis_mm.c
index b6ff069..092096c 100644 (file)
--- a/shared-core/sis_mm.c
+++ b/shared-core/sis_mm.c
@@ -34,8 +34,12 @@
 #include "sis_drv.h"
 #include "sis_ds.h"
 #if defined(__linux__) && defined(CONFIG_FB_SIS)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#include <video/sisfb.h>
+#else
 #include <linux/sisfb.h>
 #endif
+#endif
 
 #define MAX_CONTEXT 100
 #define VIDEO_TYPE 0 

diff --git a/shared/sis_mm.c b/shared/sis_mm.c
index b6ff069..092096c 100644 (file)
--- a/shared/sis_mm.c
+++ b/shared/sis_mm.c
@@ -34,8 +34,12 @@
 #include "sis_drv.h"
 #include "sis_ds.h"
 #if defined(__linux__) && defined(CONFIG_FB_SIS)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+#include <video/sisfb.h>
+#else
 #include <linux/sisfb.h>
 #endif
+#endif
 
 #define MAX_CONTEXT 100
 #define VIDEO_TYPE 0