diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-26 18:50:11 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-02-26 18:50:11 -0500 |
| commit | f851013cb2238a82782da03ac82a14447933f90d (patch) | |
| tree | f97835f69d244865c4a5397d0e6d45d1276a919d /drivers/net/ethernet/mellanox/mlx4/mlx4.h | |
| parent | f2699491e06584a2ebb0939f108ad29f3b151456 (diff) | |
| parent | 203738e548cefc3fc3c2f73a9063176c9f3583d5 (diff) | |
Merge remote-tracking branch 'origin/master' into next
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/mlx4.h')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4.h b/drivers/net/ethernet/mellanox/mlx4/mlx4.h index c92269f8c057..28f8251561f4 100644 --- a/drivers/net/ethernet/mellanox/mlx4/mlx4.h +++ b/drivers/net/ethernet/mellanox/mlx4/mlx4.h | |||
| @@ -697,7 +697,7 @@ struct mlx4_sense { | |||
| 697 | 697 | ||
| 698 | struct mlx4_msix_ctl { | 698 | struct mlx4_msix_ctl { |
| 699 | u64 pool_bm; | 699 | u64 pool_bm; |
| 700 | spinlock_t pool_lock; | 700 | struct mutex pool_lock; |
| 701 | }; | 701 | }; |
| 702 | 702 | ||
| 703 | struct mlx4_steer { | 703 | struct mlx4_steer { |