diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-04 22:29:52 -0600 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-04 22:29:52 -0600 |
| commit | 849a8924a6740ecbf9711e015beca69425f0c429 (patch) | |
| tree | 2bae44c5fb170a655696b7253eec7ee13c6fa437 /drivers/scsi/constants.c | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
| parent | ee807c2d43b54183c16580857837dae8ccb2ed22 (diff) | |
| download | op-kernel-dev-849a8924a6740ecbf9711e015beca69425f0c429.zip op-kernel-dev-849a8924a6740ecbf9711e015beca69425f0c429.tar.gz | |
Merge by Hand
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>
Diffstat (limited to 'drivers/scsi/constants.c')
| -rw-r--r-- | drivers/scsi/constants.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c index f6be2c1..09bc815 100644 --- a/drivers/scsi/constants.c +++ b/drivers/scsi/constants.c @@ -1389,10 +1389,7 @@ EXPORT_SYMBOL(scsi_print_msg); void scsi_print_command(struct scsi_cmnd *cmd) { /* Assume appended output (i.e. not at start of line) */ - printk("scsi%d : destination target %d, lun %d\n", - cmd->device->host->host_no, - cmd->device->id, - cmd->device->lun); + sdev_printk("", cmd->device, "\n"); printk(KERN_INFO " command: "); scsi_print_cdb(cmd->cmnd, cmd->cmd_len, 0); } |
