summaryrefslogtreecommitdiffstats
path: root/drivers/video/sis/sis.h
diff options
context:
space:
mode:
authorFernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>2007-11-05 08:21:11 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2008-02-01 23:34:48 +0100
commited8a5d49a0d4b5cf411a71476e6582f153df54e3 (patch)
treebf6d32fc0500380c597bfd039adcec1dbf675d70 /drivers/video/sis/sis.h
parentUSB: sis FB driver: *_ioctl32_conversion functions do not exist in recent ker... (diff)
downloadlinux-ed8a5d49a0d4b5cf411a71476e6582f153df54e3.tar.xz
linux-ed8a5d49a0d4b5cf411a71476e6582f153df54e3.zip
USB: sisusb: *_ioctl32_conversion functions do not exist in recent kernels
Remove dead code while at it. Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 @@
#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)
@@ -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;