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/osst.c | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
| parent | ee807c2d43b54183c16580857837dae8ccb2ed22 (diff) | |
| download | kernel-crypto-849a8924a6740ecbf9711e015beca69425f0c429.tar.gz kernel-crypto-849a8924a6740ecbf9711e015beca69425f0c429.tar.xz kernel-crypto-849a8924a6740ecbf9711e015beca69425f0c429.zip | |
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/osst.c')
| -rw-r--r-- | drivers/scsi/osst.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index 172839fce0e..1cf11c3322f 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c @@ -5819,9 +5819,9 @@ static int osst_probe(struct device *dev) } drive->number = devfs_register_tape(SDp->devfs_name); - printk(KERN_INFO - "osst :I: Attached OnStream %.5s tape at scsi%d, channel %d, id %d, lun %d as %s\n", - SDp->model, SDp->host->host_no, SDp->channel, SDp->id, SDp->lun, tape_name(tpnt)); + sdev_printk(KERN_INFO, SDp, + "osst :I: Attached OnStream %.5s tape as %s\n", + SDp->model, tape_name(tpnt)); return 0; |