Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / drivers / video / sis / sis.h

diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index d5e2d9c..9b05da6 100644 (file)
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -39,12 +39,7 @@
 #include <linux/spinlock.h>
 
 #ifdef CONFIG_COMPAT
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10)
-#include <linux/ioctl32.h>
-#define SIS_OLD_CONFIG_COMPAT
-#else
 #define SIS_NEW_CONFIG_COMPAT
-#endif
 #endif /* CONFIG_COMPAT */
 
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
@@ -479,7 +474,7 @@ struct sis_video_info {
        struct fb_var_screeninfo default_var;
 
        struct fb_fix_screeninfo sisfb_fix;
-       u32             pseudo_palette[17];
+       u32             pseudo_palette[16];
 
        struct sisfb_monitor {
                u16 hmin;
@@ -607,9 +602,6 @@ struct sis_video_info {
        int             haveXGIROM;
        int             registered;
        int             warncount;
-#ifdef SIS_OLD_CONFIG_COMPAT
-       int             ioctl32registered;
-#endif
 
        int             sisvga_engine;
        int             hwcursor_size;