sugar/linux
1
0
Fork 0
Code Activity

Merge by Hand

Browse Source 
Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley
2005-11-04 22:29:52 -06:00
parent 7015faa7df ee807c2d43
commit 849a8924a6
135 changed files with 29933 additions and 37041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/ide-scsi.c
View File

@@ -899,7 +899,7 @@ static int idescsi_queue (struct scsi_cmnd *cmd,
idescsi_pc_t *pc = NULL;
if (!drive) {
printk (KERN_ERR "ide-scsi: drive id %d not present\n", cmd->device->id);
scmd_printk (KERN_ERR, cmd, "drive not present\n");
goto abort;
}
scsi = drive_to_idescsi(drive);