diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-12-15 21:17:02 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-12-15 21:17:02 -0500 |
| commit | 7b16318dea8d9840dac567a2ae8c50ecdea36aea (patch) | |
| tree | 8866511a03ba28dcfd98263aa0a8c65ef876c31b /drivers/scsi/st.c | |
| parent | 2a1e1379bae53f647c463a677cc2ec71b591c348 (diff) | |
Fix up SCSI mismerge
I forgot to do a git-update-cache on the merged files ...
Diffstat (limited to 'drivers/scsi/st.c')
| -rw-r--r-- | drivers/scsi/st.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 894ad53be04b..c4aade8f5345 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
| @@ -4198,7 +4198,7 @@ static int st_init_command(struct scsi_cmnd *SCpnt) | |||
| 4198 | if (!(SCpnt->request->flags & REQ_BLOCK_PC)) | 4198 | if (!(SCpnt->request->flags & REQ_BLOCK_PC)) |
| 4199 | return 0; | 4199 | return 0; |
| 4200 | 4200 | ||
| 4201 | scsi_setup_blk_pc_cmnd(SCpnt, 0); | 4201 | scsi_setup_blk_pc_cmnd(SCpnt); |
| 4202 | SCpnt->done = st_intr; | 4202 | SCpnt->done = st_intr; |
| 4203 | return 1; | 4203 | return 1; |
| 4204 | } | 4204 | } |