diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /drivers/scsi/scsi.c | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'drivers/scsi/scsi.c')
| -rw-r--r-- | drivers/scsi/scsi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 166417a6afba..2de5f3ad640b 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c | |||
| @@ -1225,8 +1225,8 @@ EXPORT_SYMBOL(__scsi_device_lookup_by_target); | |||
| 1225 | * @starget: SCSI target pointer | 1225 | * @starget: SCSI target pointer |
| 1226 | * @lun: SCSI Logical Unit Number | 1226 | * @lun: SCSI Logical Unit Number |
| 1227 | * | 1227 | * |
| 1228 | * Description: Looks up the scsi_device with the specified @channel, @id, @lun | 1228 | * Description: Looks up the scsi_device with the specified @lun for a given |
| 1229 | * for a given host. The returned scsi_device has an additional reference that | 1229 | * @starget. The returned scsi_device has an additional reference that |
| 1230 | * needs to be released with scsi_device_put once you're done with it. | 1230 | * needs to be released with scsi_device_put once you're done with it. |
| 1231 | **/ | 1231 | **/ |
| 1232 | struct scsi_device *scsi_device_lookup_by_target(struct scsi_target *starget, | 1232 | struct scsi_device *scsi_device_lookup_by_target(struct scsi_target *starget, |