diff options
| author | Colin Cross <ccross@android.com> | 2012-03-05 14:17:12 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-03-05 14:17:12 -0800 |
| commit | 91154555190c1d25d02db5240a4cb89d2603c6da (patch) | |
| tree | c86651082158fd88d5c5a71b8fdef36153ece212 /drivers/net/ethernet/mellanox/mlx4/mlx4.h | |
| parent | cd7bc93466877cb1396cbddb4e608252db2a9a3f (diff) | |
| parent | 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d (diff) | |
Merge commit 'v3.3-rc6' into android-3.3
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 { struct mlx4_msix_ctl { u64 pool_bm; - spinlock_t pool_lock; + struct mutex pool_lock; }; struct mlx4_steer { |