diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 10:07:25 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-21 10:07:25 -0700 |
| commit | 90125edbc49ec58b9101c4271bb1d87b04a4620f (patch) | |
| tree | 068353d4234435b17ade687b50a5d5015bdf1ad9 /drivers/infiniband/hw/cxgb4/iw_cxgb4.h | |
| parent | 0a8adf584759cbcbce5d88d419db01a8d0373abf (diff) | |
| parent | 9a3c4145af32125c5ee39c0272662b47307a8323 (diff) | |
| download | op-kernel-dev-90125edbc49ec58b9101c4271bb1d87b04a4620f.zip op-kernel-dev-90125edbc49ec58b9101c4271bb1d87b04a4620f.tar.gz | |
Merge 3.16-rc6 into driver-core-next
We want the platform changes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/infiniband/hw/cxgb4/iw_cxgb4.h')
| -rw-r--r-- | drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h index 125bc5d..361fff7 100644 --- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h +++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h @@ -908,7 +908,7 @@ int c4iw_destroy_ctrl_qp(struct c4iw_rdev *rdev); int c4iw_register_device(struct c4iw_dev *dev); void c4iw_unregister_device(struct c4iw_dev *dev); int __init c4iw_cm_init(void); -void __exit c4iw_cm_term(void); +void c4iw_cm_term(void); void c4iw_release_dev_ucontext(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx); void c4iw_init_dev_ucontext(struct c4iw_rdev *rdev, |
