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/infiniband/hw/ipath | |
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/infiniband/hw/ipath')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_sd7220.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c index 4bd39c8af80f..37d12e5efa49 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6110.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c | |||
@@ -381,7 +381,7 @@ static const ipath_err_t infinipath_hwe_htclnkbbyte1crcerr = | |||
381 | #define IPATH_GPIO_SCL \ | 381 | #define IPATH_GPIO_SCL \ |
382 | (1ULL << (_IPATH_GPIO_SCL_NUM+INFINIPATH_EXTC_GPIOOE_SHIFT)) | 382 | (1ULL << (_IPATH_GPIO_SCL_NUM+INFINIPATH_EXTC_GPIOOE_SHIFT)) |
383 | 383 | ||
384 | /* keep the code below somewhat more readonable; not used elsewhere */ | 384 | /* keep the code below somewhat more readable; not used elsewhere */ |
385 | #define _IPATH_HTLINK0_CRCBITS (infinipath_hwe_htclnkabyte0crcerr | \ | 385 | #define _IPATH_HTLINK0_CRCBITS (infinipath_hwe_htclnkabyte0crcerr | \ |
386 | infinipath_hwe_htclnkabyte1crcerr) | 386 | infinipath_hwe_htclnkabyte1crcerr) |
387 | #define _IPATH_HTLINK1_CRCBITS (infinipath_hwe_htclnkbbyte0crcerr | \ | 387 | #define _IPATH_HTLINK1_CRCBITS (infinipath_hwe_htclnkbbyte0crcerr | \ |
diff --git a/drivers/infiniband/hw/ipath/ipath_sd7220.c b/drivers/infiniband/hw/ipath/ipath_sd7220.c index aa47eb549520..2a68d9f624dd 100644 --- a/drivers/infiniband/hw/ipath/ipath_sd7220.c +++ b/drivers/infiniband/hw/ipath/ipath_sd7220.c | |||
@@ -614,7 +614,7 @@ static int epb_trans(struct ipath_devdata *dd, u16 reg, u64 i_val, u64 *o_vp) | |||
614 | * @wd: Write Data - value to set in register | 614 | * @wd: Write Data - value to set in register |
615 | * @mask: ones where data should be spliced into reg. | 615 | * @mask: ones where data should be spliced into reg. |
616 | * | 616 | * |
617 | * Basic register read/modify/write, with un-needed acesses elided. That is, | 617 | * Basic register read/modify/write, with un-needed accesses elided. That is, |
618 | * a mask of zero will prevent write, while a mask of 0xFF will prevent read. | 618 | * a mask of zero will prevent write, while a mask of 0xFF will prevent read. |
619 | * returns current (presumed, if a write was done) contents of selected | 619 | * returns current (presumed, if a write was done) contents of selected |
620 | * register, or <0 if errors. | 620 | * register, or <0 if errors. |
@@ -989,7 +989,7 @@ static struct rxeq_init { | |||
989 | /* Set DFELTHFDR/HDR thresholds */ | 989 | /* Set DFELTHFDR/HDR thresholds */ |
990 | RXEQ_VAL(7, 8, 0, 0, 0, 0), /* FDR */ | 990 | RXEQ_VAL(7, 8, 0, 0, 0, 0), /* FDR */ |
991 | RXEQ_VAL(7, 0x21, 0, 0, 0, 0), /* HDR */ | 991 | RXEQ_VAL(7, 0x21, 0, 0, 0, 0), /* HDR */ |
992 | /* Set TLTHFDR/HDR theshold */ | 992 | /* Set TLTHFDR/HDR threshold */ |
993 | RXEQ_VAL(7, 9, 2, 2, 2, 2), /* FDR */ | 993 | RXEQ_VAL(7, 9, 2, 2, 2, 2), /* FDR */ |
994 | RXEQ_VAL(7, 0x23, 2, 2, 2, 2), /* HDR */ | 994 | RXEQ_VAL(7, 0x23, 2, 2, 2, 2), /* HDR */ |
995 | /* Set Preamp setting 2 (ZFR/ZCNT) */ | 995 | /* Set Preamp setting 2 (ZFR/ZCNT) */ |