aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sis/sis.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/sis/sis.h')
-rw-r--r--drivers/video/sis/sis.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index d53bf6945f0c..9b05da6268f7 100644
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -39,12 +39,7 @@
39#include <linux/spinlock.h> 39#include <linux/spinlock.h>
40 40
41#ifdef CONFIG_COMPAT 41#ifdef CONFIG_COMPAT
42#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10)
43#include <linux/ioctl32.h>
44#define SIS_OLD_CONFIG_COMPAT
45#else
46#define SIS_NEW_CONFIG_COMPAT 42#define SIS_NEW_CONFIG_COMPAT
47#endif
48#endif /* CONFIG_COMPAT */ 43#endif /* CONFIG_COMPAT */
49 44
50#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8) 45#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
@@ -607,9 +602,6 @@ struct sis_video_info {
607 int haveXGIROM; 602 int haveXGIROM;
608 int registered; 603 int registered;
609 int warncount; 604 int warncount;
610#ifdef SIS_OLD_CONFIG_COMPAT
611 int ioctl32registered;
612#endif
613 605
614 int sisvga_engine; 606 int sisvga_engine;
615 int hwcursor_size; 607 int hwcursor_size;