diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /drivers/scsi/NCR5380.c | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/NCR5380.c')
| -rw-r--r-- | drivers/scsi/NCR5380.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index fa57e0b4a5fd..75f2f7ae2a8e 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c | |||
| @@ -500,7 +500,7 @@ static void NCR5380_print_phase(struct Scsi_Host *instance) | |||
| 500 | /* | 500 | /* |
| 501 | * Function : int should_disconnect (unsigned char cmd) | 501 | * Function : int should_disconnect (unsigned char cmd) |
| 502 | * | 502 | * |
| 503 | * Purpose : decide weather a command would normally disconnect or | 503 | * Purpose : decide whether a command would normally disconnect or |
| 504 | * not, since if it won't disconnect we should go to sleep. | 504 | * not, since if it won't disconnect we should go to sleep. |
| 505 | * | 505 | * |
| 506 | * Input : cmd - opcode of SCSI command | 506 | * Input : cmd - opcode of SCSI command |