diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/infiniband/hw/qib/qib_init.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/infiniband/hw/qib/qib_init.c')
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c index ffefb78b894..a01f3fce8eb 100644 --- a/drivers/infiniband/hw/qib/qib_init.c +++ b/drivers/infiniband/hw/qib/qib_init.c | |||
| @@ -346,7 +346,7 @@ done: | |||
| 346 | * @dd: the qlogic_ib device | 346 | * @dd: the qlogic_ib device |
| 347 | * | 347 | * |
| 348 | * sanity check at least some of the values after reset, and | 348 | * sanity check at least some of the values after reset, and |
| 349 | * ensure no receive or transmit (explictly, in case reset | 349 | * ensure no receive or transmit (explicitly, in case reset |
| 350 | * failed | 350 | * failed |
| 351 | */ | 351 | */ |
| 352 | static int init_after_reset(struct qib_devdata *dd) | 352 | static int init_after_reset(struct qib_devdata *dd) |