lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix up SCSI mismerge

Browse Source 
I forgot to do a git-update-cache on the merged files ...
This commit is contained in:
James Bottomley
2005-12-15 20:17:02 -06:00
parent 2a1e1379ba
commit 7b16318dea
5 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/scsi/scsi_cmnd.h
View File

@ -151,6 +151,6 @@ extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t);
extern void scsi_put_command(struct scsi_cmnd *);
extern void scsi_io_completion(struct scsi_cmnd *, unsigned int, unsigned int);
extern void scsi_finish_command(struct scsi_cmnd *cmd);
extern void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd, int retries);
extern void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd);
#endif /* _SCSI_SCSI_CMND_H */