summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/osst.c
diff options
context:
space:
mode:
authorJames Bottomley <jejb@mulgrave.(none)>2005-10-29 09:42:17 -0500
committerJames Bottomley <jejb@mulgrave.(none)>2005-10-29 09:42:17 -0500
commit80e23babfcf21a2dc726d3be00e06993f02f0274 (patch)
treeb4b3d48156c72e6c4997cae00fa270715a754066 /drivers/scsi/osst.c
parent19a7b4aebf9ad435c69a7e39930338499af4d152 (diff)
downloadlinux-stable-80e23babfcf21a2dc726d3be00e06993f02f0274.tar.gz
linux-stable-80e23babfcf21a2dc726d3be00e06993f02f0274.tar.bz2
linux-stable-80e23babfcf21a2dc726d3be00e06993f02f0274.zip
[SCSI] fix up mismerge in osst
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/osst.c')
-rw-r--r--drivers/scsi/osst.c2
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)
}
drive->number = devfs_register_tape(SDp->devfs_name);
- sdev_printk(KERN_INFO, &SDp,
+ sdev_printk(KERN_INFO, SDp,
"osst :I: Attached OnStream %.5s tape as %s\n",
SDp->model, tape_name(tpnt));