diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:43:10 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-30 20:43:10 -0500 |
commit | 590cf28580c999c8ba70dc39b40bab09d69e2630 (patch) | |
tree | 22b9aa4b148bea8a310b760521d1032eef7d743f /drivers/net/Kconfig | |
parent | f54a6ec0fd85002d94d05b4bb679508eeb066683 (diff) | |
parent | fb5edd020fa0fbe991f4a473611ad530d2237425 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (104 commits)
[SCSI] fcoe: fix configuration problems
[SCSI] cxgb3i: fix select/depend problem
[SCSI] fcoe: fix incorrect use of struct module
[SCSI] cxgb3i: remove use of skb->sp
[SCSI] cxgb3i: Add cxgb3i iSCSI driver.
[SCSI] zfcp: Remove unnecessary warning message
[SCSI] zfcp: Add support for unchained FSF requests
[SCSI] zfcp: Remove busid macro
[SCSI] zfcp: remove DID_DID flag
[SCSI] zfcp: Simplify mask lookups for incoming RSCNs
[SCSI] zfcp: Remove initial device data from zfcp_data
[SCSI] zfcp: fix compile warning
[SCSI] zfcp: Remove adapter list
[SCSI] zfcp: Simplify SBAL allocation to fix sparse warnings
[SCSI] zfcp: register with SCSI layer on ccw registration
[SCSI] zfcp: Fix message line break
[SCSI] qla2xxx: changes in multiq code
[SCSI] eata: fix the data buffer accessors conversion regression
[SCSI] ibmvfc: Improve async event handling
[SCSI] lpfc : correct printk types on PPC compiles
...
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 72a9212da865..9a18270c1081 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2399,9 +2399,14 @@ config CHELSIO_T1_1G | |||
2399 | Enables support for Chelsio's gigabit Ethernet PCI cards. If you | 2399 | Enables support for Chelsio's gigabit Ethernet PCI cards. If you |
2400 | are using only 10G cards say 'N' here. | 2400 | are using only 10G cards say 'N' here. |
2401 | 2401 | ||
2402 | config CHELSIO_T3_DEPENDS | ||
2403 | tristate | ||
2404 | depends on PCI && INET | ||
2405 | default y | ||
2406 | |||
2402 | config CHELSIO_T3 | 2407 | config CHELSIO_T3 |
2403 | tristate "Chelsio Communications T3 10Gb Ethernet support" | 2408 | tristate "Chelsio Communications T3 10Gb Ethernet support" |
2404 | depends on PCI && INET | 2409 | depends on CHELSIO_T3_DEPENDS |
2405 | select FW_LOADER | 2410 | select FW_LOADER |
2406 | select INET_LRO | 2411 | select INET_LRO |
2407 | help | 2412 | help |