diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-04 23:29:52 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-04 23:29:52 -0500 |
| commit | 849a8924a6740ecbf9711e015beca69425f0c429 (patch) | |
| tree | 2bae44c5fb170a655696b7253eec7ee13c6fa437 /drivers/scsi/ch.c | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
| parent | ee807c2d43b54183c16580857837dae8ccb2ed22 (diff) | |
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/ch.c')
| -rw-r--r-- | drivers/scsi/ch.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index 540147cb51ce..ccbbae2bf478 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c | |||
| @@ -940,9 +940,7 @@ static int ch_probe(struct device *dev) | |||
| 940 | MKDEV(SCSI_CHANGER_MAJOR,ch->minor), | 940 | MKDEV(SCSI_CHANGER_MAJOR,ch->minor), |
| 941 | dev, "s%s", ch->name); | 941 | dev, "s%s", ch->name); |
| 942 | 942 | ||
| 943 | printk(KERN_INFO "Attached scsi changer %s " | 943 | sdev_printk(KERN_INFO, sd, "Attached scsi changer %s\n", ch->name); |
| 944 | "at scsi%d, channel %d, id %d, lun %d\n", | ||
| 945 | ch->name, sd->host->host_no, sd->channel, sd->id, sd->lun); | ||
| 946 | 944 | ||
| 947 | spin_lock(&ch_devlist_lock); | 945 | spin_lock(&ch_devlist_lock); |
| 948 | list_add_tail(&ch->list,&ch_devlist); | 946 | list_add_tail(&ch->list,&ch_devlist); |