diff options
author | Daniel Vetter | 2017-02-26 21:34:42 +0100 |
---|---|---|
committer | Daniel Vetter | 2017-02-26 21:34:42 +0100 |
commit | 8e22e1b3499a446df48c2b26667ca36c55bf864c (patch) | |
tree | 5329f98b3eb3c95a9dcbab0fa4f9b6e62f0e788d /drivers/net/ethernet/mellanox/mlx4/catas.c | |
parent | drm: Add name for DRM_DP_DUAL_MODE_LSPCON (diff) | |
parent | lib/Kconfig: make PRIME_NUMBERS not user selectable. (diff) | |
download | kernel-qcow2-linux-8e22e1b3499a446df48c2b26667ca36c55bf864c.tar.gz kernel-qcow2-linux-8e22e1b3499a446df48c2b26667ca36c55bf864c.tar.xz kernel-qcow2-linux-8e22e1b3499a446df48c2b26667ca36c55bf864c.zip |
Merge airlied/drm-next into drm-misc-next
Backmerge the main pull request to sync up with all the newly landed
drivers. Otherwise we'll have chaos even before 4.12 started in
earnest.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/catas.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/catas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/catas.c b/drivers/net/ethernet/mellanox/mlx4/catas.c index c7e939945259..53daa6ca5d83 100644 --- a/drivers/net/ethernet/mellanox/mlx4/catas.c +++ b/drivers/net/ethernet/mellanox/mlx4/catas.c @@ -158,7 +158,7 @@ static int mlx4_reset_slave(struct mlx4_dev *dev) return -ETIMEDOUT; } -static int mlx4_comm_internal_err(u32 slave_read) +int mlx4_comm_internal_err(u32 slave_read) { return (u32)COMM_CHAN_EVENT_INTERNAL_ERR == (slave_read & (u32)COMM_CHAN_EVENT_INTERNAL_ERR) ? 1 : 0; |