diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-24 16:09:13 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-24 16:09:13 -0700 |
| commit | 152cbcf94baec68b45832db5024184906ab798b1 (patch) | |
| tree | e469a602535fec4355e5b63671eaf52cdd94caaf /drivers/net/Kconfig | |
| parent | 96ca4a2cc1454cf633a1e0796b7ef39d937b87ec (diff) | |
| parent | fa53ebac42d3de04619c813f5f6628ca2a7ce97f (diff) | |
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/Kconfig')
| -rw-r--r-- | drivers/net/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 69c81da48ebc..031b95b1f229 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2057,6 +2057,7 @@ config R8169 tristate "Realtek 8169 gigabit ethernet support" depends on PCI select CRC32 + select MII ---help--- Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter. @@ -2411,6 +2412,7 @@ config IXGBE tristate "Intel(R) 10GbE PCI Express adapters support" depends on PCI && INET select INET_LRO + select INTEL_IOATDMA ---help--- This driver supports Intel(R) 10GbE PCI Express family of adapters. For more information on how to identify your adapter, go @@ -2462,6 +2464,7 @@ config MYRI10GE select FW_LOADER select CRC32 select INET_LRO + select INTEL_IOATDMA ---help--- This driver supports Myricom Myri-10G Dual Protocol interface in Ethernet mode. If the eeprom on your board is not recent enough, |