aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmit Kumar Salecha <amit.salecha@qlogic.com>2010-01-12 19:37:26 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-16 04:17:16 -0500
commit0ec00f0392b807d57a2281576a96552d7694b6bb (patch)
tree0ecfc0f71db0f25578ae804db89495e9b7aee4cd
parentaf19b49152bdb68fda894183e88096d6d1aa5c3d (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--MAINTAINERS7
-rw-r--r--drivers/net/Kconfig7
-rw-r--r--drivers/net/Makefile1
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
4452F: Documentation/networking/LICENSE.qla3xxx 4452F: Documentation/networking/LICENSE.qla3xxx
4453F: drivers/net/qla3xxx.* 4453F: drivers/net/qla3xxx.*
4454 4454
4455QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
4456M: Amit Kumar Salecha <amit.salecha@qlogic.com>
4457M: linux-driver@qlogic.com
4458L: netdev@vger.kernel.org
4459S: Supported
4460F: drivers/net/qlcnic/
4461
4455QLOGIC QLGE 10Gb ETHERNET DRIVER 4462QLOGIC QLGE 10Gb ETHERNET DRIVER
4456M: Ron Mercer <ron.mercer@qlogic.com> 4463M: Ron Mercer <ron.mercer@qlogic.com>
4457M: linux-driver@qlogic.com 4464M: 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
2781config 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
2781config QLGE 2788config 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
149obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o 149obj-$(CONFIG_XILINX_LL_TEMAC) += ll_temac.o
150obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o 150obj-$(CONFIG_XILINX_EMACLITE) += xilinx_emaclite.o
151obj-$(CONFIG_QLA3XXX) += qla3xxx.o 151obj-$(CONFIG_QLA3XXX) += qla3xxx.o
152obj-$(CONFIG_QLCNIC) += qlcnic/
152obj-$(CONFIG_QLGE) += qlge/ 153obj-$(CONFIG_QLGE) += qlge/
153 154
154obj-$(CONFIG_PPP) += ppp_generic.o 155obj-$(CONFIG_PPP) += ppp_generic.o