The patch titled drivers/video/sis/sis_main.c Removal of old code has been removed from the -mm tree. Its filename is drivers-video-sis-sis_mainc-removal-of-old-2.patch This patch was dropped because it was folded into drivers-video-sis-sis_mainc-removal-of-old.patch ------------------------------------------------------ Subject: drivers/video/sis/sis_main.c Removal of old code From: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx> This is an upgrade to the previous patch. (drivers-video-sis-sis_mainc-removal-of-old.patch) 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/sis_main.c | 6 ------ 1 file changed, 6 deletions(-) diff -puN drivers/video/sis/sis_main.c~drivers-video-sis-sis_mainc-removal-of-old-2 drivers/video/sis/sis_main.c --- a/drivers/video/sis/sis_main.c~drivers-video-sis-sis_mainc-removal-of-old-2 +++ a/drivers/video/sis/sis_main.c @@ -83,13 +83,7 @@ sisfb_setdefaultparms(void) sisfb_max = -1; sisfb_userom = -1; sisfb_useoem = -1; -#ifdef MODULE - /* Module: "None" for 2.4, default mode for 2.5+ */ - sisfb_mode_idx = -1; -#else - /* Static: Default mode */ sisfb_mode_idx = -1; -#endif sisfb_parm_rate = -1; sisfb_crt1off = 0; sisfb_forcecrt1 = -1; _ Patches currently in -mm which might be from michal.k.k.piotrowski@xxxxxxxxx are origin.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_mainc-removal-of-old-2.patch drivers-video-sis-vgatypesh-removal-of-old.patch drivers-video-sis-sis_mainh-removal-of-old.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