diff options
author | Amit Kumar Salecha <amit.salecha@qlogic.com> | 2010-01-12 19:37:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-16 04:17:16 -0500 |
commit | 0ec00f0392b807d57a2281576a96552d7694b6bb (patch) | |
tree | 0ecfc0f71db0f25578ae804db89495e9b7aee4cd | |
parent | af19b49152bdb68fda894183e88096d6d1aa5c3d (diff) |
NET: Add Qlogic ethernet driver for CNA devices
o Separate Ethernet driver for Qlogic CNA devices
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | MAINTAINERS | 7 | ||||
-rw-r--r-- | drivers/net/Kconfig | 7 | ||||
-rw-r--r-- | drivers/net/Makefile | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 337dffbe9a47..61367ec865cb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4452,6 +4452,13 @@ S: Supported | |||
4452 | F: Documentation/networking/LICENSE.qla3xxx | 4452 | F: Documentation/networking/LICENSE.qla3xxx |
4453 | F: drivers/net/qla3xxx.* | 4453 | F: drivers/net/qla3xxx.* |
4454 | 4454 | ||
4455 | QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER | ||
4456 | M: Amit Kumar Salecha <amit.salecha@qlogic.com> | ||
4457 | M: linux-driver@qlogic.com | ||
4458 | L: netdev@vger.kernel.org | ||
4459 | S: Supported | ||
4460 | F: drivers/net/qlcnic/ | ||
4461 | |||
4455 | QLOGIC QLGE 10Gb ETHERNET DRIVER | 4462 | QLOGIC QLGE 10Gb ETHERNET DRIVER |
4456 | M: Ron Mercer <ron.mercer@qlogic.com> | 4463 | M: Ron Mercer <ron.mercer@qlogic.com> |
4457 | M: linux-driver@qlogic.com | 4464 | M: linux-driver@qlogic.com |
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 5be6a2376f4f..cb0e534418e3 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2778,6 +2778,13 @@ config BNX2X | |||
2778 | To compile this driver as a module, choose M here: the module | 2778 | To compile this driver as a module, choose M here: the module |
2779 | will be called bnx2x. This is recommended. | 2779 | will be called bnx2x. This is recommended. |
2780 | 2780 | ||
2781 | config QLCNIC | ||
2782 | tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support" | ||
2783 | depends on PCI | ||
2784 | help | ||
2785 | This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet | ||
2786 | devices. | ||
2787 | |||
2781 | config QLGE | 2788 | config QLGE |
2782 | tristate "QLogic QLGE 10Gb Ethernet Driver Support" | 2789 | tristate "QLogic QLGE 10Gb Ethernet Driver Support" |
2783 | depends on PCI | 2790 | depends on PCI |
diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 6746e8b8bdfc..0b763cbe9b1f 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile | |||
@@ -149,6 +149,7 @@ ll_temac-objs := ll_temac_main.o ll_temac_mdio.o | |||
149 | obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o | 149 | obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o |
150 | obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o | 150 | obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o |
151 | obj-$(CONFIG_QLA3XXX) += qla3xxx.o | 151 | obj-$(CONFIG_QLA3XXX) += qla3xxx.o |
152 | obj-$(CONFIG_QLCNIC) += qlcnic/ | ||
152 | obj-$(CONFIG_QLGE) += qlge/ | 153 | obj-$(CONFIG_QLGE) += qlge/ |
153 | 154 | ||
154 | obj-$(CONFIG_PPP) += ppp_generic.o | 155 | obj-$(CONFIG_PPP) += ppp_generic.o |