On Mon, 2007-02-12 at 15:27 +0100, peter fuerst wrote: > ======================================================================== > --- dc7bdc97927ea1c519f0d8bd3133739600c841d4/drivers/scsi/sgiwd93.c Sat Oct 7 00:00:00 2006 > +++ new/drivers/scsi/sgiwd93.c Sun Feb 11 22:10:06 2007 > @@ -250,3 +250,3 @@ > > - hdata->wh.no_sync = 0; > + if (0xff == hdata->wh.no_sync) hdata->wh.no_sync = 0; > > ======================================================================== > > > ======================================================================== > --- dc7bdc97927ea1c519f0d8bd3133739600c841d4/drivers/scsi/sgiwd93.c Sat Oct 7 00:00:00 2006 > +++ stage2/drivers/scsi/sgiwd93.c Sun Feb 11 22:10:06 2007 > @@ -248,3 +248,3 @@ > > - wd33c93_init(host, regs, dma_setup, dma_stop, WD33C93_FS_16_20); > + wd33c93_init(host, regs, dma_setup, dma_stop, WD33C93_FS_MHZ(20)); > > ======================================================================== You don't make it easy, do you ... these are two separate patches for overlapping regions of the file ... neither quilt nor git likes this way of doing things. Plus the if should be if (hdata->wh.no_sync == 0xff) hdata->wh.no_sync = 0; to match the style of the sgiwd93.c. Since this is pretty simple, I fixed it up. James - To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
