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/firewire | |
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/firewire')
-rw-r--r-- | drivers/firewire/core-topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firewire/core-topology.c b/drivers/firewire/core-topology.c index 9a5f38c80b0e..93ec64cdeef7 100644 --- a/drivers/firewire/core-topology.c +++ b/drivers/firewire/core-topology.c | |||
@@ -183,7 +183,7 @@ static inline struct fw_node *fw_node(struct list_head *l) | |||
183 | * This function builds the tree representation of the topology given | 183 | * This function builds the tree representation of the topology given |
184 | * by the self IDs from the latest bus reset. During the construction | 184 | * by the self IDs from the latest bus reset. During the construction |
185 | * of the tree, the function checks that the self IDs are valid and | 185 | * of the tree, the function checks that the self IDs are valid and |
186 | * internally consistent. On succcess this function returns the | 186 | * internally consistent. On success this function returns the |
187 | * fw_node corresponding to the local card otherwise NULL. | 187 | * fw_node corresponding to the local card otherwise NULL. |
188 | */ | 188 | */ |
189 | static struct fw_node *build_tree(struct fw_card *card, | 189 | static struct fw_node *build_tree(struct fw_card *card, |