diff options
| author | Wolfram Sang <wsa@the-dreams.de> | 2019-05-03 15:20:04 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2019-05-03 15:20:58 +0200 |
| commit | d00afd5ede1c29a6dc59be2d7fb7d6ef28eb85c5 (patch) | |
| tree | e194b1968e54380a6654abf7d3a037ca0a010280 /include/linux/mlx5 | |
| parent | 9a51b86a61214a297cdfc1bb705b7267f9455ae6 (diff) | |
| parent | d5984d2a312144bedccf32aea2298f8df05bb617 (diff) | |
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-5.2
Mainly some pca954x work, i.e. removal of unused platform data support
and added support for sysfs interface for manipulating/examining the
idle state. And then a mechanical cocci-style patch.
Diffstat (limited to 'include/linux/mlx5')
| -rw-r--r-- | include/linux/mlx5/qp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/mlx5/qp.h b/include/linux/mlx5/qp.h index b26ea9077384..0343c81d4c5f 100644 --- a/include/linux/mlx5/qp.h +++ b/include/linux/mlx5/qp.h @@ -557,7 +557,8 @@ static inline struct mlx5_core_mkey *__mlx5_mr_lookup(struct mlx5_core_dev *dev, int mlx5_core_create_dct(struct mlx5_core_dev *dev, struct mlx5_core_dct *qp, - u32 *in, int inlen); + u32 *in, int inlen, + u32 *out, int outlen); int mlx5_core_create_qp(struct mlx5_core_dev *dev, struct mlx5_core_qp *qp, u32 *in, |