diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2007-03-26 02:17:43 -0700 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 14:16:00 -0400 |
| commit | 120bda35ff8514c937dac6d4e5c7dc6c01c699ac (patch) | |
| tree | 1d70bc79cf9b1353a3f687cc22a396c5f8eaa745 | |
| parent | 771b8dad9653d2659e0ffcc237184cb16c317788 (diff) | |
git-libata-all-ipr-fix
drivers/scsi/ipr.c: In function '__ipr_eh_dev_reset':
drivers/scsi/ipr.c:3865: warning: passing argument 4 of 'ata_do_eh' from incompatible pointer type
Cc: Tejun Heo <htejun@gmail.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/scsi/ipr.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 95045e33710d..e9bd29975db4 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -3770,7 +3770,8 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg, * Return value: * 0 on success / non-zero on failure **/ -static int ipr_sata_reset(struct ata_port *ap, unsigned int *classes) +static int ipr_sata_reset(struct ata_port *ap, unsigned int *classes, + unsigned long deadline) { struct ipr_sata_port *sata_port = ap->private_data; struct ipr_ioa_cfg *ioa_cfg = sata_port->ioa_cfg; |