The patch titled drivers/video/sis/osdef.h: removal of old code has been removed from the -mm tree. Its filename is drivers-video-sis-osdefh-removal-of-old-code.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: drivers/video/sis/osdef.h: 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/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 _ Patches currently in -mm which might be from michal.k.k.piotrowski@xxxxxxxxx are origin.patch git-scsi-misc.patch drivers-scsi-pcmcia-nsp_csh-removal-of-old.patch fs-xfs-xfs_dmapih-removal-of-old-code.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