diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /Documentation/scsi/scsi_fc_transport.txt | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'Documentation/scsi/scsi_fc_transport.txt')
| -rw-r--r-- | Documentation/scsi/scsi_fc_transport.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/scsi/scsi_fc_transport.txt b/Documentation/scsi/scsi_fc_transport.txt index e00192de4d1c..f79282fc48d7 100644 --- a/Documentation/scsi/scsi_fc_transport.txt +++ b/Documentation/scsi/scsi_fc_transport.txt | |||
| @@ -291,7 +291,7 @@ Transport <-> LLDD Interfaces : | |||
| 291 | Vport support by LLDD: | 291 | Vport support by LLDD: |
| 292 | 292 | ||
| 293 | The LLDD indicates support for vports by supplying a vport_create() | 293 | The LLDD indicates support for vports by supplying a vport_create() |
| 294 | function in the transport template. The presense of this function will | 294 | function in the transport template. The presence of this function will |
| 295 | cause the creation of the new attributes on the fc_host. As part of | 295 | cause the creation of the new attributes on the fc_host. As part of |
| 296 | the physical port completing its initialization relative to the | 296 | the physical port completing its initialization relative to the |
| 297 | transport, it should set the max_npiv_vports attribute to indicate the | 297 | transport, it should set the max_npiv_vports attribute to indicate the |