diff options
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 1d8af3348331..ad301ace6085 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2410,7 +2410,6 @@ config IXGBE | |||
2410 | tristate "Intel(R) 10GbE PCI Express adapters support" | 2410 | tristate "Intel(R) 10GbE PCI Express adapters support" |
2411 | depends on PCI && INET | 2411 | depends on PCI && INET |
2412 | select INET_LRO | 2412 | select INET_LRO |
2413 | select INTEL_IOATDMA | ||
2414 | ---help--- | 2413 | ---help--- |
2415 | This driver supports Intel(R) 10GbE PCI Express family of | 2414 | This driver supports Intel(R) 10GbE PCI Express family of |
2416 | adapters. For more information on how to identify your adapter, go | 2415 | adapters. For more information on how to identify your adapter, go |
@@ -2426,6 +2425,11 @@ config IXGBE | |||
2426 | To compile this driver as a module, choose M here. The module | 2425 | To compile this driver as a module, choose M here. The module |
2427 | will be called ixgbe. | 2426 | will be called ixgbe. |
2428 | 2427 | ||
2428 | config IXGBE_DCA | ||
2429 | bool | ||
2430 | default y | ||
2431 | depends on IXGBE && DCA && !(IXGBE=y && DCA=m) | ||
2432 | |||
2429 | config IXGB | 2433 | config IXGB |
2430 | tristate "Intel(R) PRO/10GbE support" | 2434 | tristate "Intel(R) PRO/10GbE support" |
2431 | depends on PCI | 2435 | depends on PCI |
@@ -2462,7 +2466,6 @@ config MYRI10GE | |||
2462 | select FW_LOADER | 2466 | select FW_LOADER |
2463 | select CRC32 | 2467 | select CRC32 |
2464 | select INET_LRO | 2468 | select INET_LRO |
2465 | select INTEL_IOATDMA | ||
2466 | ---help--- | 2469 | ---help--- |
2467 | This driver supports Myricom Myri-10G Dual Protocol interface in | 2470 | This driver supports Myricom Myri-10G Dual Protocol interface in |
2468 | Ethernet mode. If the eeprom on your board is not recent enough, | 2471 | Ethernet mode. If the eeprom on your board is not recent enough, |
@@ -2474,6 +2477,11 @@ config MYRI10GE | |||
2474 | To compile this driver as a module, choose M here. The module | 2477 | To compile this driver as a module, choose M here. The module |
2475 | will be called myri10ge. | 2478 | will be called myri10ge. |
2476 | 2479 | ||
2480 | config MYRI10GE_DCA | ||
2481 | bool | ||
2482 | default y | ||
2483 | depends on MYRI10GE && DCA && !(MYRI10GE=y && DCA=m) | ||
2484 | |||
2477 | config NETXEN_NIC | 2485 | config NETXEN_NIC |
2478 | tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC" | 2486 | tristate "NetXen Multi port (1/10) Gigabit Ethernet NIC" |
2479 | depends on PCI | 2487 | depends on PCI |