diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-26 14:14:47 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-26 14:14:47 +1000 |
| commit | 6b4fba3f85b2bc1dcfc35400b3cfaa6fd233e30b (patch) | |
| tree | 4bc57fe67f238e32bc46535bd64317258e9f8601 /drivers/infiniband/hw/ipath/ipath_iba6110.c | |
| parent | bd5a88283b2053b130c7a00b2471269fa6d423f4 (diff) | |
| parent | 585c63a7bbc251de79d6b014ad17c8f4b4745af0 (diff) | |
Merge commit 'trivial/for-next'
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_iba6110.c')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c index 02831ad070b8..4bd39c8af80f 100644 --- a/drivers/infiniband/hw/ipath/ipath_iba6110.c +++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c @@ -809,7 +809,7 @@ static int ipath_setup_ht_reset(struct ipath_devdata *dd) * errors. We only bother to do this at load time, because it's OK if * it happened before we were loaded (first time after boot/reset), * but any time after that, it's fatal anyway. Also need to not check - * for for upper byte errors if we are in 8 bit mode, so figure out + * for upper byte errors if we are in 8 bit mode, so figure out * our width. For now, at least, also complain if it's 8 bit. */ static void slave_or_pri_blk(struct ipath_devdata *dd, struct pci_dev *pdev, |