drivers/video/sis/: remove more kernel 2.4 code

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 48 deletions

diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h
index b1826d3c5222..d5e2d9c27847 100644
--- a/drivers/video/sis/sis.h
+++ b/drivers/video/sis/sis.h
@@ -27,11 +27,7 @@
 #include <linux/version.h>
 
 #include "osdef.h"
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 #include <video/sisfb.h>
-#else
-#include <linux/sisfb.h>
-#endif
 
 #include "vgatypes.h"
 #include "vstruct.h"
@@ -40,12 +36,8 @@
 #define VER_MINOR               8
 #define VER_LEVEL               9
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
 #include <linux/spinlock.h>
-#define SIS_PCI_GET_CLASS(a, b) pci_get_class(a, b)
-#define SIS_PCI_GET_DEVICE(a,b,c) pci_get_device(a,b,c)
-#define SIS_PCI_GET_SLOT(a,b) pci_get_slot(a,b)
-#define SIS_PCI_PUT_DEVICE(a) pci_dev_put(a)
+
 #ifdef CONFIG_COMPAT
 #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10)
 #include <linux/ioctl32.h>
@@ -54,18 +46,7 @@
 #define SIS_NEW_CONFIG_COMPAT
 #endif
 #endif  /* CONFIG_COMPAT */
-#else  /* 2.4 */
-#define SIS_PCI_GET_CLASS(a, b) pci_find_class(a, b)
-#define SIS_PCI_GET_DEVICE(a,b,c) pci_find_device(a,b,c)
-#define SIS_PCI_GET_SLOT(a,b) pci_find_slot(a,b)
-#define SIS_PCI_PUT_DEVICE(a)
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,19)
-#ifdef __x86_64__       /* Shouldn't we check for CONFIG_IA32_EMULATION here? */
-#include <asm/ioctl32.h>
-#define SIS_OLD_CONFIG_COMPAT
-#endif
-#endif
-#endif /* 2.4 */
+
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)
 #define SIS_IOTYPE1 void __iomem
 #define SIS_IOTYPE2 __iomem
@@ -497,26 +478,8 @@ struct sis_video_info {
 
         struct fb_var_screeninfo default_var;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
         struct fb_fix_screeninfo sisfb_fix;
         u32             pseudo_palette[17];
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        struct display           sis_disp;
-        struct display_switch    sisfb_sw;
-        struct {
-                u16 red, green, blue, pad;
-        }               sis_palette[256];
-        union {
-#ifdef FBCON_HAS_CFB16
-                u16 cfb16[16];
-#endif
-#ifdef FBCON_HAS_CFB32
-                u32 cfb32[16];
-#endif
-        }               sis_fbcon_cmap;
-#endif
 
         struct sisfb_monitor {
                 u16 hmin;
@@ -537,10 +500,6 @@ struct sis_video_info {
 
         int             mni;    /* Mode number index */
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        int             currcon;
-#endif
-
         unsigned long   video_size;
         unsigned long   video_base;
         unsigned long   mmio_size;
@@ -577,9 +536,6 @@ struct sis_video_info {
         int             sisfb_tvplug;
         int             sisfb_tvstd;
         int             sisfb_nocrt2rate;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-        int             sisfb_inverse;
-#endif
 
         u32             heapstart;              /* offset  */
         SIS_IOTYPE1     *sisfb_heap_start;      /* address */
@@ -645,9 +601,7 @@ struct sis_video_info {
         int             modechanged;
         unsigned char   modeprechange;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
         u8              sisfb_lastrates[128];
-#endif
 
         int             newrom;
         int             haveXGIROM;