diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /drivers/scsi/aic7xxx/aic79xx_osm.c | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx_osm.c')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 6466a184a141..329cb2331339 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
| @@ -1505,7 +1505,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd) | |||
| 1505 | memset(recovery_cmd, 0, sizeof(struct scsi_cmnd)); | 1505 | memset(recovery_cmd, 0, sizeof(struct scsi_cmnd)); |
| 1506 | recovery_cmd->device = cmd->device; | 1506 | recovery_cmd->device = cmd->device; |
| 1507 | recovery_cmd->scsi_done = ahd_linux_dev_reset_complete; | 1507 | recovery_cmd->scsi_done = ahd_linux_dev_reset_complete; |
| 1508 | #if AHD_DEBUG | 1508 | #ifdef AHD_DEBUG |
| 1509 | if ((ahd_debug & AHD_SHOW_RECOVERY) != 0) | 1509 | if ((ahd_debug & AHD_SHOW_RECOVERY) != 0) |
| 1510 | printf("%s:%d:%d:%d: Device reset called for cmd %p\n", | 1510 | printf("%s:%d:%d:%d: Device reset called for cmd %p\n", |
| 1511 | ahd_name(ahd), cmd->device->channel, cmd->device->id, | 1511 | ahd_name(ahd), cmd->device->channel, cmd->device->id, |