diff options
author | Olof Johansson | 2012-03-07 14:52:43 -0800 |
---|---|---|
committer | Olof Johansson | 2012-03-07 14:53:14 -0800 |
commit | 591e7afd2e686394912d65a6faeb933b76b26b5d (patch) | |
tree | 5e992381e6d9456d6293d16ad1c2ed36efcb7bd3 /drivers/net/ethernet/mellanox/mlx4/mlx4.h | |
parent | ff0ea1ee058e3906502452eba60fd220ece4401d (diff) | |
parent | c9f46a850a07dcf45ee195b958593fae1b78c221 (diff) |
Merge branch 'maintainers' of git://gitorious.org/linux-davinci/linux-davinci into next/maintainers
* 'maintainers' of git://gitorious.org/linux-davinci/linux-davinci: (2 commits)
MAINTAINERS: add TI DaVinci git tree information
MAINTAINERS: mark TI DaVinci list as "moderated"
(also included an update to 3.3-rc6)
Signed-off-by: Olof Johansson <olof@lixom.net>
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 { |