From 0959f0ca29244ae983b406fba313816a29244be7 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Tue, 8 May 2007 00:39:50 -0700 Subject: [PATCH] drivers/video/sis/: remove more kernel 2.4 code Signed-off-by: Adrian Bunk Cc: Thomas Winischhofer Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/sis/osdef.h | 5 -- drivers/video/sis/sis.h | 50 +---------------- drivers/video/sis/sis_main.c | 105 +++++++---------------------------- 3 files changed, 22 insertions(+), 138 deletions(-) diff --git a/drivers/video/sis/osdef.h b/drivers/video/sis/osdef.h index d048bd39961b..c1492782cb18 100644 --- a/drivers/video/sis/osdef.h +++ b/drivers/video/sis/osdef.h @@ -58,9 +58,6 @@ #define SIS_LINUX_KERNEL /* Linux kernel framebuffer */ #undef SIS_XORG_XF86 /* XFree86/X.org */ -#undef SIS_LINUX_KERNEL_24 -#undef SIS_LINUX_KERNEL_26 - #ifdef OutPortByte #undef OutPortByte #endif @@ -100,8 +97,6 @@ #define SIS315H #endif -#define SIS_LINUX_KERNEL_26 - #if !defined(SIS300) && !defined(SIS315H) #warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set #warning sisfb will not work! 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 #include "osdef.h" -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #include