Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14aefd1b authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

video/sis/: remove compat code 



This patch removes compat code for older kernel versions.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Cc: <thomas@winischhofer.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0b9cf3aa

drivers/video/sis/init.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ 
#ifdef SIS_CP

#undef SIS_CP

#endif

#include <linux/version.h>

#include <linux/types.h>

#include <asm/io.h>

#include <linux/fb.h>

drivers/video/sis/init301.h

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ 
#ifdef SIS_CP

#undef SIS_CP

#endif

#include <linux/version.h>

#include <linux/types.h>

#include <asm/io.h>

#include <linux/fb.h>

drivers/video/sis/initextlfb.c

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "vgatypes.h"

#include "vstruct.h"



#include <linux/version.h>

#include <linux/types.h>

#include <linux/fb.h>

drivers/video/sis/osdef.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ 
/**********************************************************************/



#ifdef SIS_LINUX_KERNEL

#include <linux/version.h>



#ifdef CONFIG_FB_SIS_300

#define SIS300

drivers/video/sis/sis.h

+5 −17
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#ifndef _SIS_H_

#define _SIS_H_



#include <linux/version.h>



#include "osdef.h"

#include <video/sisfb.h>
@@ -42,16 +40,6 @@ 
#define SIS_NEW_CONFIG_COMPAT

#endif	/* CONFIG_COMPAT */



#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8)

#define SIS_IOTYPE1 void __iomem

#define SIS_IOTYPE2 __iomem

#define SISINITSTATIC static

#else

#define SIS_IOTYPE1 unsigned char

#define SIS_IOTYPE2

#define SISINITSTATIC

#endif



#undef SISFBDEBUG



#ifdef SISFBDEBUG
@@ -505,8 +493,8 @@ struct sis_video_info { 


	unsigned long	UMAsize, LFBsize;



	SIS_IOTYPE1	*video_vbase;

	SIS_IOTYPE1	*mmio_vbase;

	void __iomem	*video_vbase;

	void __iomem	*mmio_vbase;



	unsigned char	*bios_abase;
@@ -533,8 +521,8 @@ struct sis_video_info { 
	int		sisfb_nocrt2rate;



	u32		heapstart;		/* offset  */

	SIS_IOTYPE1	*sisfb_heap_start;	/* address */

	SIS_IOTYPE1	*sisfb_heap_end;	/* address */

	void __iomem	*sisfb_heap_start;	/* address */

	void __iomem	*sisfb_heap_end;	/* address */

	u32		sisfb_heap_size;

	int		havenoheap;
@@ -612,7 +600,7 @@ struct sis_video_info { 
	u8		detectedpdca;

	u8		detectedlcda;



	SIS_IOTYPE1	*hwcursor_vbase;

	void __iomem	*hwcursor_vbase;



	int		chronteltype;

	int		tvxpos, tvypos;