diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 00:32:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 00:32:38 +0200 |
| commit | 064c94f9da8845f12446ab37142aa10f3c6f66ac (patch) | |
| tree | 974a69a06e7f9218ad987e41fc6627d62eac091e /drivers/infiniband/hw/mthca/mthca_mcg.c | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| parent | IB/mad: RMPP support for additional classes (diff) | |
| download | linux-064c94f9da8845f12446ab37142aa10f3c6f66ac.tar.xz linux-064c94f9da8845f12446ab37142aa10f3c6f66ac.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/mad: RMPP support for additional classes
IB/mad: include GID/class when matching receives
IB/mthca: Fix section mismatch problems
IPoIB: Fix oops with raw sockets
IB/mthca: Fix check of size in SRQ creation
IB/srp: Fix unmapping of fake scatterlist
Diffstat (limited to 'drivers/infiniband/hw/mthca/mthca_mcg.c')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_mcg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c index 9965bda9afed..47ca8a9b7247 100644 --- a/drivers/infiniband/hw/mthca/mthca_mcg.c +++ b/drivers/infiniband/hw/mthca/mthca_mcg.c @@ -388,7 +388,7 @@ int __devinit mthca_init_mcg_table(struct mthca_dev *dev) return 0; } -void __devexit mthca_cleanup_mcg_table(struct mthca_dev *dev) +void mthca_cleanup_mcg_table(struct mthca_dev *dev) { mthca_alloc_cleanup(&dev->mcg_table.alloc); } |