From e5b1c7100a8425838fd9fd3656b45e346fe30aa8 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Wed, 13 Oct 2010 15:12:53 +0000
Subject: [PATCH] --- yaml --- r: 215180 b: refs/heads/master c:
 e00ce92e0bb966227e88d674d4f7311f4f3bacac h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/infiniband/hw/mlx4/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2eb32cedef4f..2ddf8c9f802a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cadb7924b10b2a3117dafe14d6d6d28035ec4ddb
+refs/heads/master: e00ce92e0bb966227e88d674d4f7311f4f3bacac
diff --git a/trunk/drivers/infiniband/hw/mlx4/Kconfig b/trunk/drivers/infiniband/hw/mlx4/Kconfig
index 4175a4bd0c78..bd995b2b50d8 100644
--- a/trunk/drivers/infiniband/hw/mlx4/Kconfig
+++ b/trunk/drivers/infiniband/hw/mlx4/Kconfig
@@ -1,5 +1,6 @@
 config MLX4_INFINIBAND
 	tristate "Mellanox ConnectX HCA support"
+	depends on NETDEVICES && NETDEV_10000 && PCI
 	select MLX4_CORE
 	---help---
 	  This driver provides low-level InfiniBand support for