This patch fixes the following compile warning: drivers/scsi/ipr.c: In function '__ipr_eh_dev_reset': drivers/scsi/ipr.c:3955: warning: passing argument 4 of 'ata_do_eh' from incompatible pointer type This patch reverts the following commit, which looks to have been pushed before the ata_do_eh API change got pushed. http://git.kernel.org/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=120bda35ff8514c937dac6d4e5c7dc6c01c699ac;hp=771b8dad9653d2659e0ffcc237184cb16c317788 Signed-off-by: Brian King <brking@xxxxxxxxxxxxxxxxxx> --- linux-2.6-bjking1/drivers/scsi/ipr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN drivers/scsi/ipr.c~ipr_ata_do_eh_fix drivers/scsi/ipr.c --- linux-2.6/drivers/scsi/ipr.c~ipr_ata_do_eh_fix 2007-05-04 15:13:08.000000000 -0500 +++ linux-2.6-bjking1/drivers/scsi/ipr.c 2007-05-04 17:07:34.000000000 -0500 @@ -3857,8 +3857,7 @@ static int ipr_device_reset(struct ipr_i * Return value: * 0 on success / non-zero on failure **/ -static int ipr_sata_reset(struct ata_port *ap, unsigned int *classes, - unsigned long deadline) +static int ipr_sata_reset(struct ata_port *ap, unsigned int *classes) { struct ipr_sata_port *sata_port = ap->private_data; struct ipr_ioa_cfg *ioa_cfg = sata_port->ioa_cfg; _ - 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
