diff options
author | Dimitris Michailidis <dm@chelsio.com> | 2010-04-01 11:28:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-01 22:29:17 -0400 |
commit | 43e9da8d782b8a40d5127fcc59ac2e543cf16d7d (patch) | |
tree | d7e083d49c56cea7bff2548ccfdd26ef961f6c31 | |
parent | b8ff05a9c3237f694a1c3bf8ceec3bf6c3c14b15 (diff) |
net: Hook up cxgb4 to Kconfig and Makefile
Signed-off-by: Dimitris Michailidis <dm@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/Kconfig | 25 | ||||
-rw-r--r-- | drivers/net/Makefile | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 0ba5b8e50a7c..7b832c727f87 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2582,6 +2582,31 @@ config CHELSIO_T3 | |||
2582 | To compile this driver as a module, choose M here: the module | 2582 | To compile this driver as a module, choose M here: the module |
2583 | will be called cxgb3. | 2583 | will be called cxgb3. |
2584 | 2584 | ||
2585 | config CHELSIO_T4_DEPENDS | ||
2586 | tristate | ||
2587 | depends on PCI && INET | ||
2588 | default y | ||
2589 | |||
2590 | config CHELSIO_T4 | ||
2591 | tristate "Chelsio Communications T4 Ethernet support" | ||
2592 | depends on CHELSIO_T4_DEPENDS | ||
2593 | select FW_LOADER | ||
2594 | select MDIO | ||
2595 | help | ||
2596 | This driver supports Chelsio T4-based gigabit and 10Gb Ethernet | ||
2597 | adapters. | ||
2598 | |||
2599 | For general information about Chelsio and our products, visit | ||
2600 | our website at <http://www.chelsio.com>. | ||
2601 | |||
2602 | For customer support, please visit our customer support page at | ||
2603 | <http://www.chelsio.com/support.htm>. | ||
2604 | |||
2605 | Please send feedback to <linux-bugs@chelsio.com>. | ||
2606 | |||
2607 | To compile this driver as a module choose M here; the module | ||
2608 | will be called cxgb4. | ||
2609 | |||
2585 | config EHEA | 2610 | config EHEA |
2586 | tristate "eHEA Ethernet support" | 2611 | tristate "eHEA Ethernet support" |
2587 | depends on IBMEBUS && INET && SPARSEMEM | 2612 | depends on IBMEBUS && INET && SPARSEMEM |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 478886234c28..a583b50d9de8 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
@@ -19,6 +19,7 @@ obj-$(CONFIG_IXGB) += ixgb/ | |||
19 | obj-$(CONFIG_IP1000) += ipg.o | 19 | obj-$(CONFIG_IP1000) += ipg.o |
20 | obj-$(CONFIG_CHELSIO_T1) += chelsio/ | 20 | obj-$(CONFIG_CHELSIO_T1) += chelsio/ |
21 | obj-$(CONFIG_CHELSIO_T3) += cxgb3/ | 21 | obj-$(CONFIG_CHELSIO_T3) += cxgb3/ |
22 | obj-$(CONFIG_CHELSIO_T4) += cxgb4/ | ||
22 | obj-$(CONFIG_EHEA) += ehea/ | 23 | obj-$(CONFIG_EHEA) += ehea/ |
23 | obj-$(CONFIG_CAN) += can/ | 24 | obj-$(CONFIG_CAN) += can/ |
24 | obj-$(CONFIG_BONDING) += bonding/ | 25 | obj-$(CONFIG_BONDING) += bonding/ |