diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:04:18 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 19:04:18 -0500 |
| commit | 3afa294c40013be5d8180005002e3f648d04d942 (patch) | |
| tree | 8a8b7464fd8ee4901288afb3e9e8d761ef45647d /drivers/scsi/ppa.c | |
| parent | a1541d5af66d02426655b1498f814c52347dd7d3 (diff) | |
| parent | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (diff) | |
merge by hand (qla_os.c mismerge)
Diffstat (limited to 'drivers/scsi/ppa.c')
| -rw-r--r-- | drivers/scsi/ppa.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c index 96b4522523d..fafcf5d185e 100644 --- a/drivers/scsi/ppa.c +++ b/drivers/scsi/ppa.c @@ -17,6 +17,7 @@ #include <linux/blkdev.h> #include <linux/parport.h> #include <linux/workqueue.h> +#include <linux/delay.h> #include <asm/io.h> #include <scsi/scsi.h> @@ -891,9 +892,9 @@ static int ppa_reset(struct scsi_cmnd *cmd) ppa_connect(dev, CONNECT_NORMAL); ppa_reset_pulse(dev->base); - udelay(1000); /* device settle delay */ + mdelay(1); /* device settle delay */ ppa_disconnect(dev); - udelay(1000); /* device settle delay */ + mdelay(1); /* device settle delay */ return SUCCESS; } |