From: James Bottomley <jejb@mulgrave.(none)>
Date: Sat, 29 Oct 2005 14:42:17 +0000 (-0500)
Subject: [SCSI] fix up mismerge in osst
X-Git-Tag: v2.6.15-rc1~723^2~2^2~18
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=80e23babfcf21a2dc726d3be00e06993f02f0274;p=linux-2.6-omap-h63xx.git

[SCSI] fix up mismerge in osst

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 011f3c8fe56..c65c418a790 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));