The patch titled drivers/video/sis/initextlfb.c: removal of old code has been added to the -mm tree. Its filename is drivers-video-sis-initextlfbc-removal-of.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: drivers/video/sis/initextlfb.c: removal of old code From: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx> Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx> Cc: "Antonino A. Daplas" <adaplas@xxxxxxx> Cc: Thomas Winischhofer <thomas@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/video/sis/initextlfb.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN drivers/video/sis/initextlfb.c~drivers-video-sis-initextlfbc-removal-of drivers/video/sis/initextlfb.c --- a/drivers/video/sis/initextlfb.c~drivers-video-sis-initextlfbc-removal-of +++ a/drivers/video/sis/initextlfb.c @@ -34,12 +34,10 @@ #include <linux/types.h> #include <linux/fb.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) int sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr, unsigned char modeno, unsigned char rateindex); int sisfb_mode_rate_to_ddata(struct SiS_Private *SiS_Pr, unsigned char modeno, unsigned char rateindex, struct fb_var_screeninfo *var); -#endif BOOLEAN sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, int *htotal, int *vtotal, unsigned char rateindex); @@ -49,7 +47,6 @@ extern BOOLEAN SiS_SearchModeID(struct S extern void SiS_Generic_ConvertCRData(struct SiS_Private *SiS_Pr, unsigned char *crdata, int xres, int yres, struct fb_var_screeninfo *var, BOOLEAN writeres); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) int sisfb_mode_rate_to_dclock(struct SiS_Private *SiS_Pr, unsigned char modeno, unsigned char rateindex) @@ -177,7 +174,6 @@ sisfb_mode_rate_to_ddata(struct SiS_Priv return 1; } -#endif /* Linux >= 2.5 */ BOOLEAN sisfb_gettotalfrommode(struct SiS_Private *SiS_Pr, unsigned char modeno, int *htotal, _ Patches currently in -mm which might be from michal.k.k.piotrowski@xxxxxxxxx are csa-basic-accounting-over-taskstats-fix.patch drivers-video-sis-init301h-removal-of-old.patch drivers-video-sis-initextlfbc-removal-of.patch drivers-video-sis-inith-removal-of-old-code.patch drivers-video-sis-osdefh-removal-of-old-code.patch drivers-video-sis-sis_accelc-removal-of-old.patch drivers-video-sis-sis_accelh-removal-of-old.patch drivers-video-sis-sis_mainc-removal-of-old.patch drivers-video-sis-sis_mainh-removal-of-old.patch drivers-video-sis-vgatypesh-removal-of-old.patch fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch the-scheduled-removal-of-some-oss-drivers-fix-fix.patch kill-include-linux-configh.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html