diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-23 21:26:27 -0400 |
| commit | 8244132ea89cdd128003f5b9980fab50d8d36d72 (patch) | |
| tree | c6cf9327cf9b6bab5bb830bbf389a514f4d7bb95 /drivers/net/Kconfig | |
| parent | 7b2ff18ee7b0ec4bc3162f821e221781aaca48bd (diff) | |
| parent | 38000a94a902e94ca8b5498f7871c6316de8957a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/ip_output.c
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index fe113d0e9456..71e6f8fc0cf1 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
| @@ -2755,6 +2755,7 @@ config MYRI10GE_DCA | |||
| 2755 | config NETXEN_NIC | 2755 | config NETXEN_NIC |
| 2756 | tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC" | 2756 | tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC" |
| 2757 | depends on PCI | 2757 | depends on PCI |
| 2758 | select FW_LOADER | ||
| 2758 | help | 2759 | help |
| 2759 | This enables the support for NetXen's Gigabit Ethernet card. | 2760 | This enables the support for NetXen's Gigabit Ethernet card. |
| 2760 | 2761 | ||
| @@ -2820,6 +2821,7 @@ config BNX2X | |||
| 2820 | config QLCNIC | 2821 | config QLCNIC |
| 2821 | tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support" | 2822 | tristate "QLOGIC QLCNIC 1/10Gb Converged Ethernet NIC Support" |
| 2822 | depends on PCI | 2823 | depends on PCI |
| 2824 | select FW_LOADER | ||
| 2823 | help | 2825 | help |
| 2824 | This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet | 2826 | This driver supports QLogic QLE8240 and QLE8242 Converged Ethernet |
| 2825 | devices. | 2827 | devices. |