diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 22:43:33 -0500 |
commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
tree | 856ba96302a36014736747e8464f80eeb827bbdd /drivers/scsi/lpfc/lpfc_attr.c | |
parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
tree-wide: fix misspelling of "definition" in comments
reiserfs: fix misspelling of "journaled"
doc: Fix a typo in slub.txt.
inotify: remove superfluous return code check
hdlc: spelling fix in find_pvc() comment
doc: fix regulator docs cut-and-pasteism
mtd: Fix comment in Kconfig
doc: Fix IRQ chip docs
tree-wide: fix assorted typos all over the place
drivers/ata/libata-sff.c: comment spelling fixes
fix typos/grammos in Documentation/edac.txt
sysctl: add missing comments
fs/debugfs/inode.c: fix comment typos
sgivwfb: Make use of ARRAY_SIZE.
sky2: fix sky2_link_down copy/paste comment error
tree-wide: fix typos "couter" -> "counter"
tree-wide: fix typos "offest" -> "offset"
fix kerneldoc for set_irq_msi()
spidev: fix double "of of" in comment
comment typo fix: sybsystem -> subsystem
...
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_attr.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_attr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 75523603b91c..91542f786edf 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
@@ -678,7 +678,7 @@ lpfc_selective_reset(struct lpfc_hba *phba) | |||
678 | * Notes: | 678 | * Notes: |
679 | * Assumes any error from lpfc_selective_reset() will be negative. | 679 | * Assumes any error from lpfc_selective_reset() will be negative. |
680 | * If lpfc_selective_reset() returns zero then the length of the buffer | 680 | * If lpfc_selective_reset() returns zero then the length of the buffer |
681 | * is returned which indicates succcess | 681 | * is returned which indicates success |
682 | * | 682 | * |
683 | * Returns: | 683 | * Returns: |
684 | * -EINVAL if the buffer does not contain the string "selective" | 684 | * -EINVAL if the buffer does not contain the string "selective" |
@@ -3363,7 +3363,7 @@ sysfs_ctlreg_write(struct kobject *kobj, struct bin_attribute *bin_attr, | |||
3363 | * sysfs_ctlreg_read - Read method for reading from ctlreg | 3363 | * sysfs_ctlreg_read - Read method for reading from ctlreg |
3364 | * @kobj: kernel kobject that contains the kernel class device. | 3364 | * @kobj: kernel kobject that contains the kernel class device. |
3365 | * @bin_attr: kernel attributes passed to us. | 3365 | * @bin_attr: kernel attributes passed to us. |
3366 | * @buf: if succesful contains the data from the adapter IOREG space. | 3366 | * @buf: if successful contains the data from the adapter IOREG space. |
3367 | * @off: offset into buffer to beginning of data. | 3367 | * @off: offset into buffer to beginning of data. |
3368 | * @count: bytes to transfer. | 3368 | * @count: bytes to transfer. |
3369 | * | 3369 | * |