3 files changed, 1 insertions, 3 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fb99cd445504..c5baa197bc08 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2508,6 +2508,7 @@ config MLX4_CORE
 
 config MLX4_DEBUG
         bool "Verbose debugging output" if (MLX4_CORE && EMBEDDED)
+        depends on MLX4_CORE
         default y
         ---help---
           This option causes debugging code to be compiled into the
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
index 4debb024eaf9..20b8c0d3ced4 100644
--- a/drivers/net/mlx4/main.c
+++ b/drivers/net/mlx4/main.c
@@ -542,8 +542,6 @@ static int __devinit mlx4_setup_hca(struct mlx4_dev *dev)
         struct mlx4_priv *priv = mlx4_priv(dev);
         int err;
 
-        MLX4_INIT_DOORBELL_LOCK(&priv->doorbell_lock);
-
         err = mlx4_init_uar_table(dev);
         if (err) {
                 mlx4_err(dev, "Failed to initialize "
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index 9befbae3d196..3d3b6d24d8d3 100644
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -275,7 +275,6 @@ struct mlx4_priv {
 
         struct mlx4_uar         driver_uar;
         void __iomem           *kar;
-        MLX4_DECLARE_DOORBELL_LOCK(doorbell_lock)
 
         u32                     rev_id;
         char                    board_id[MLX4_BOARD_ID_LEN];