From: Michal Piotrowski Signed-off-by: Michal Piotrowski Cc: "Antonino A. Daplas" Cc: Thomas Winischhofer Signed-off-by: Andrew Morton --- drivers/video/sis/osdef.h | 4 ---- 1 file changed, 4 deletions(-) diff -puN drivers/video/sis/osdef.h~drivers-video-sis-osdefh-removal-of-old-code drivers/video/sis/osdef.h --- a/drivers/video/sis/osdef.h~drivers-video-sis-osdefh-removal-of-old-code +++ a/drivers/video/sis/osdef.h @@ -100,11 +100,7 @@ #define SIS315H #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) #define SIS_LINUX_KERNEL_26 -#else -#define SIS_LINUX_KERNEL_24 -#endif #if !defined(SIS300) && !defined(SIS315H) #warning Neither CONFIG_FB_SIS_300 nor CONFIG_FB_SIS_315 is set _