aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCasey Leedom <leedom@chelsio.com>2010-06-25 08:15:33 -0400
committerDavid S. Miller <davem@davemloft.net>2010-06-29 02:59:37 -0400
commitcfc9b16b75f2cef1e0b283fd2b52ddde568401ab (patch)
tree1f804804fa7585d5102f5f7dfd13349749511ac4
parent84c6ade7a7542a42dd9a0e804b7aee05041570ce (diff)
cxgb4vf: Stitch new T4 PCI-E SR-IOV Virtual Function driver into the build
Stitch new T4 PCI-E SR-IOV Virtual Function driver into the build. Signed-off-by: Casey Leedom Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/Kconfig23
-rw-r--r--drivers/net/Makefile1
2 files changed, 24 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c05e506a87ab..60d067acf028 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -2602,6 +2602,29 @@ config CHELSIO_T4
2602 To compile this driver as a module choose M here; the module 2602 To compile this driver as a module choose M here; the module
2603 will be called cxgb4. 2603 will be called cxgb4.
2604 2604
2605config CHELSIO_T4VF_DEPENDS
2606 tristate
2607 depends on PCI && INET
2608 default y
2609
2610config CHELSIO_T4VF
2611 tristate "Chelsio Communications T4 Virtual Function Ethernet support"
2612 depends on CHELSIO_T4VF_DEPENDS
2613 help
2614 This driver supports Chelsio T4-based gigabit and 10Gb Ethernet
2615 adapters with PCI-E SR-IOV Virtual Functions.
2616
2617 For general information about Chelsio and our products, visit
2618 our website at <http://www.chelsio.com>.
2619
2620 For customer support, please visit our customer support page at
2621 <http://www.chelsio.com/support.htm>.
2622
2623 Please send feedback to <linux-bugs@chelsio.com>.
2624
2625 To compile this driver as a module choose M here; the module
2626 will be called cxgb4vf.
2627
2605config EHEA 2628config EHEA
2606 tristate "eHEA Ethernet support" 2629 tristate "eHEA Ethernet support"
2607 depends on IBMEBUS && INET && SPARSEMEM 2630 depends on IBMEBUS && INET && SPARSEMEM
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 0a0512ae77da..49384ca27eaf 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_IP1000) += ipg.o
20obj-$(CONFIG_CHELSIO_T1) += chelsio/ 20obj-$(CONFIG_CHELSIO_T1) += chelsio/
21obj-$(CONFIG_CHELSIO_T3) += cxgb3/ 21obj-$(CONFIG_CHELSIO_T3) += cxgb3/
22obj-$(CONFIG_CHELSIO_T4) += cxgb4/ 22obj-$(CONFIG_CHELSIO_T4) += cxgb4/
23obj-$(CONFIG_CHELSIO_T4VF) += cxgb4vf/
23obj-$(CONFIG_EHEA) += ehea/ 24obj-$(CONFIG_EHEA) += ehea/
24obj-$(CONFIG_CAN) += can/ 25obj-$(CONFIG_CAN) += can/
25obj-$(CONFIG_BONDING) += bonding/ 26obj-$(CONFIG_BONDING) += bonding/