diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-06 11:34:06 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-06 11:34:06 -0400 |
commit | cb4361c1dc29cd870f664c004b1817106fbce0fa (patch) | |
tree | c31533210d738c9074b21b8f31fe0399b39545f0 /drivers/net/Kconfig | |
parent | 309361e09ca9e9670dc8664e5d14125bf82078af (diff) | |
parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (37 commits)
smc91c92_cs: fix the problem of "Unable to find hardware address"
r8169: clean up my printk uglyness
net: Hook up cxgb4 to Kconfig and Makefile
cxgb4: Add main driver file and driver Makefile
cxgb4: Add remaining driver headers and L2T management
cxgb4: Add packet queues and packet DMA code
cxgb4: Add HW and FW support code
cxgb4: Add register, message, and FW definitions
netlabel: Fix several rcu_dereference() calls used without RCU read locks
bonding: fix potential deadlock in bond_uninit()
net: check the length of the socket address passed to connect(2)
stmmac: add documentation for the driver.
stmmac: fix kconfig for crc32 build error
be2net: fix bug in vlan rx path for big endian architecture
be2net: fix flashing on big endian architectures
be2net: fix a bug in flashing the redboot section
bonding: bond_xmit_roundrobin() fix
drivers/net: Add missing unlock
net: gianfar - align BD ring size console messages
net: gianfar - initialize per-queue statistics
...
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 0ba5b8e50a7..7b832c727f8 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2582,6 +2582,31 @@ config CHELSIO_T3 | |||
2582 | To compile this driver as a module, choose M here: the module | 2582 | To compile this driver as a module, choose M here: the module |
2583 | will be called cxgb3. | 2583 | will be called cxgb3. |
2584 | 2584 | ||
2585 | config CHELSIO_T4_DEPENDS | ||
2586 | tristate | ||
2587 | depends on PCI && INET | ||
2588 | default y | ||
2589 | |||
2590 | config CHELSIO_T4 | ||
2591 | tristate "Chelsio Communications T4 Ethernet support" | ||
2592 | depends on CHELSIO_T4_DEPENDS | ||
2593 | select FW_LOADER | ||
2594 | select MDIO | ||
2595 | help | ||
2596 | This driver supports Chelsio T4-based gigabit and 10Gb Ethernet | ||
2597 | adapters. | ||
2598 | |||
2599 | For general information about Chelsio and our products, visit | ||
2600 | our website at <http://www.chelsio.com>. | ||
2601 | |||
2602 | For customer support, please visit our customer support page at | ||
2603 | <http://www.chelsio.com/support.htm>. | ||
2604 | |||
2605 | Please send feedback to <linux-bugs@chelsio.com>. | ||
2606 | |||
2607 | To compile this driver as a module choose M here; the module | ||
2608 | will be called cxgb4. | ||
2609 | |||
2585 | config EHEA | 2610 | config EHEA |
2586 | tristate "eHEA Ethernet support" | 2611 | tristate "eHEA Ethernet support" |
2587 | depends on IBMEBUS && INET && SPARSEMEM | 2612 | depends on IBMEBUS && INET && SPARSEMEM |