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/aacraid | |
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/aacraid')
-rw-r--r-- | drivers/scsi/aacraid/aacraid.h | 6 | ||||
-rw-r--r-- | drivers/scsi/aacraid/comminit.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h index cdbdec9f4fb2..83986ed86556 100644 --- a/drivers/scsi/aacraid/aacraid.h +++ b/drivers/scsi/aacraid/aacraid.h | |||
@@ -526,10 +526,10 @@ struct aac_driver_ident | |||
526 | 526 | ||
527 | /* | 527 | /* |
528 | * The adapter interface specs all queues to be located in the same | 528 | * The adapter interface specs all queues to be located in the same |
529 | * physically contigous block. The host structure that defines the | 529 | * physically contiguous block. The host structure that defines the |
530 | * commuication queues will assume they are each a separate physically | 530 | * commuication queues will assume they are each a separate physically |
531 | * contigous memory region that will support them all being one big | 531 | * contiguous memory region that will support them all being one big |
532 | * contigous block. | 532 | * contiguous block. |
533 | * There is a command and response queue for each level and direction of | 533 | * There is a command and response queue for each level and direction of |
534 | * commuication. These regions are accessed by both the host and adapter. | 534 | * commuication. These regions are accessed by both the host and adapter. |
535 | */ | 535 | */ |
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c index d598eba630d0..666d5151d628 100644 --- a/drivers/scsi/aacraid/comminit.c +++ b/drivers/scsi/aacraid/comminit.c | |||
@@ -226,7 +226,7 @@ static int aac_comm_init(struct aac_dev * dev) | |||
226 | spin_lock_init(&dev->fib_lock); | 226 | spin_lock_init(&dev->fib_lock); |
227 | 227 | ||
228 | /* | 228 | /* |
229 | * Allocate the physically contigous space for the commuication | 229 | * Allocate the physically contiguous space for the commuication |
230 | * queue headers. | 230 | * queue headers. |
231 | */ | 231 | */ |
232 | 232 | ||