The patch titled drivers/scsi/gdth.h: removal of old scsi code has been added to the -mm tree. Its filename is drivers-scsi-gdthh-removal-of-old-scsi-code.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/scsi/gdth.h: removal of old scsi code From: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx> Signed-off-by: Michal Piotrowski <michal.k.k.piotrowski@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/scsi/gdth.h | 10 ---------- 1 files changed, 10 deletions(-) diff -puN drivers/scsi/gdth.h~drivers-scsi-gdthh-removal-of-old-scsi-code drivers/scsi/gdth.h --- a/drivers/scsi/gdth.h~drivers-scsi-gdthh-removal-of-old-scsi-code +++ a/drivers/scsi/gdth.h @@ -936,18 +936,12 @@ typedef struct { gdth_binfo_str binfo; /* controller info */ gdth_evt_data dvr; /* event structure */ spinlock_t smp_lock; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) struct pci_dev *pdev; -#endif char oem_name[8]; #ifdef GDTH_DMA_STATISTICS ulong dma32_cnt, dma64_cnt; /* statistics: DMA buffer */ #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) struct scsi_device *sdev; -#else - struct scsi_device sdev; -#endif } gdth_ha_str; /* structure for scsi_register(), SCSI bus != 0 */ @@ -1029,10 +1023,6 @@ typedef struct { /* function prototyping */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) int gdth_proc_info(struct Scsi_Host *, char *,char **,off_t,int,int); -#else -int gdth_proc_info(char *,char **,off_t,int,int,int); -#endif #endif _ Patches currently in -mm which might be from michal.k.k.piotrowski@xxxxxxxxx are fs-jffs2-jffs2_fs_ih-removal-of-old-code.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 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-vgatypesh-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