summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-10-09 14:11:30 +0200
committerTakashi Iwai <tiwai@suse.de>2017-10-09 14:11:30 +0200
commit545633f6fecd240bfa50bb8e2db627eac76f9f8a (patch)
tree7b68d3d5d49e352c5d1eaecd5e0958db89bda09a /drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h
parent3a9fce327ff9cabf7f89d3f20616a83af28393da (diff)
parent5803b023881857db32ffefa0d269c90280a67ee0 (diff)
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h')
-rw-r--r--drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h b/drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h
index 94bdfd47c3f0..d05233c9b4f6 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h
@@ -65,7 +65,7 @@ struct mlx5_fpga_qp_counters {
u64 rx_total_drop;
};
-int mlx5_fpga_caps(struct mlx5_core_dev *dev, u32 *caps);
+int mlx5_fpga_caps(struct mlx5_core_dev *dev);
int mlx5_fpga_query(struct mlx5_core_dev *dev, struct mlx5_fpga_query *query);
int mlx5_fpga_ctrl_op(struct mlx5_core_dev *dev, u8 op);
int mlx5_fpga_access_reg(struct mlx5_core_dev *dev, u8 size, u64 addr,