From 99464f3aee5ac7dcae2586890ffb6a1d3dfe3a95 Mon Sep 17 00:00:00 2001
From: Casey Leedom <leedom@chelsio.com>
Date: Fri, 25 Jun 2010 12:15:33 +0000
Subject: [PATCH] --- yaml --- r: 203209 b: refs/heads/master c:
 cfc9b16b75f2cef1e0b283fd2b52ddde568401ab h: refs/heads/master i:   203207:
 f2bd8fed56601e4f3b92cd21b0bb88cb1e280e5d v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/net/Kconfig  | 23 +++++++++++++++++++++++
 trunk/drivers/net/Makefile |  1 +
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 738bb764096c..ce1dc00eef4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84c6ade7a7542a42dd9a0e804b7aee05041570ce
+refs/heads/master: cfc9b16b75f2cef1e0b283fd2b52ddde568401ab
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
index c05e506a87ab..60d067acf028 100644
--- a/trunk/drivers/net/Kconfig
+++ b/trunk/drivers/net/Kconfig
@@ -2602,6 +2602,29 @@ config CHELSIO_T4
 	  To compile this driver as a module choose M here; the module
 	  will be called cxgb4.
 
+config CHELSIO_T4VF_DEPENDS
+	tristate
+	depends on PCI && INET
+	default y
+
+config CHELSIO_T4VF
+	tristate "Chelsio Communications T4 Virtual Function Ethernet support"
+	depends on CHELSIO_T4VF_DEPENDS
+	help
+	  This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
+	  adapters with PCI-E SR-IOV Virtual Functions.
+
+	  For general information about Chelsio and our products, visit
+	  our website at <http://www.chelsio.com>.
+
+	  For customer support, please visit our customer support page at
+	  <http://www.chelsio.com/support.htm>.
+
+	  Please send feedback to <linux-bugs@chelsio.com>.
+
+	  To compile this driver as a module choose M here; the module
+	  will be called cxgb4vf.
+
 config EHEA
 	tristate "eHEA Ethernet support"
 	depends on IBMEBUS && INET && SPARSEMEM
diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
index 0a0512ae77da..49384ca27eaf 100644
--- a/trunk/drivers/net/Makefile
+++ b/trunk/drivers/net/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CHELSIO_T1) += chelsio/
 obj-$(CONFIG_CHELSIO_T3) += cxgb3/
 obj-$(CONFIG_CHELSIO_T4) += cxgb4/
+obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/
 obj-$(CONFIG_EHEA) += ehea/
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/