Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[karo-tx-linux.git] / drivers / net / ethernet / qlogic / Kconfig

diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig
index f1f0108c275d7017fff5a5ad39eefeb9beddeb70..30a6f246dfc9f004ac68f4b2cc84658186dce9e6 100644 (file)
--- a/drivers/net/ethernet/qlogic/Kconfig
+++ b/drivers/net/ethernet/qlogic/Kconfig
@@ -91,4 +91,15 @@ config NETXEN_NIC
        ---help---
          This enables the support for NetXen's Gigabit Ethernet card.
 
+config QED
+       tristate "QLogic QED 25/40/100Gb core driver"
+       depends on PCI
+       ---help---
+         This enables the support for ...
+
+config QEDE
+       tristate "QLogic QED 25/40/100Gb Ethernet NIC"
+       depends on QED
+       ---help---
+         This enables the support for ...
 endif # NET_VENDOR_QLOGIC