The patch titled drivers/net/typhoon.c Removal of old code has been removed from the -mm tree. Its filename is drivers-net-typhoonc-removal-of-old-code.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: drivers/net/typhoon.c Removal of old code From: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx> Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx> Cc: Jeff Garzik <jeff@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/net/typhoon.c | 4 ---- 1 file changed, 4 deletions(-) diff -puN drivers/net/typhoon.c~drivers-net-typhoonc-removal-of-old-code drivers/net/typhoon.c --- a/drivers/net/typhoon.c~drivers-net-typhoonc-removal-of-old-code +++ a/drivers/net/typhoon.c @@ -333,11 +333,7 @@ enum state_values { #define TYPHOON_RESET_TIMEOUT_NOSLEEP ((6 * 1000000) / TYPHOON_UDELAY) #define TYPHOON_WAIT_TIMEOUT ((1000000 / 2) / TYPHOON_UDELAY) -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 28) -#define typhoon_synchronize_irq(x) synchronize_irq() -#else #define typhoon_synchronize_irq(x) synchronize_irq(x) -#endif #if defined(NETIF_F_TSO) #define skb_tso_size(x) (skb_shinfo(x)->gso_size) _ Patches currently in -mm which might be from michal.k.k.piotrowski@xxxxxxxxx are origin.patch git-netdev-all.patch drivers-scsi-dpt-dpti_i2oh-removal-of-old.patch drivers-scsi-gdthh-removal-of-old-scsi-code.patch drivers-scsi-nsp32h-removal-of-old-scsi-code.patch drivers-scsi-pcmcia-nsp_csh-removal-of-old.patch drivers-message-fusion-linux_compath-removal-of-old-code.patch fs-xfs-xfs_dmapih-removal-of-old-code.patch 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_mainc-removal-of-old-2.patch drivers-video-sis-vgatypesh-removal-of-old.patch drivers-video-sis-sis_mainh-removal-of-old.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