diff options
| author | James Bottomley <jejb@mulgrave.(none)> | 2005-10-29 10:42:17 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-10-29 10:42:17 -0400 |
| commit | 80e23babfcf21a2dc726d3be00e06993f02f0274 (patch) | |
| tree | b4b3d48156c72e6c4997cae00fa270715a754066 | |
| parent | 19a7b4aebf9ad435c69a7e39930338499af4d152 (diff) | |
[SCSI] fix up mismerge in osst
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| -rw-r--r-- | drivers/scsi/osst.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index 011f3c8fe56f..c65c418a7906 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c | |||
| @@ -5819,7 +5819,7 @@ static int osst_probe(struct device *dev) | |||
| 5819 | } | 5819 | } |
| 5820 | drive->number = devfs_register_tape(SDp->devfs_name); | 5820 | drive->number = devfs_register_tape(SDp->devfs_name); |
| 5821 | 5821 | ||
| 5822 | sdev_printk(KERN_INFO, &SDp, | 5822 | sdev_printk(KERN_INFO, SDp, |
| 5823 | "osst :I: Attached OnStream %.5s tape as %s\n", | 5823 | "osst :I: Attached OnStream %.5s tape as %s\n", |
| 5824 | SDp->model, tape_name(tpnt)); | 5824 | SDp->model, tape_name(tpnt)); |
| 5825 | 5825 | ||