diff options
| author | Linus Torvalds | 2009-06-17 18:50:44 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-06-17 18:50:44 +0200 |
| commit | aa2638a210ab0d7c6702cd54315365785fce326c (patch) | |
| tree | ccc6a99248a1e914fbb90a466b76c98e4f083bc6 /drivers/net | |
| parent | Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6 (diff) | |
| parent | [SCSI] aic79xx: make driver respect nvram for IU and QAS settings (diff) | |
| download | kernel-qcow2-linux-aa2638a210ab0d7c6702cd54315365785fce326c.tar.gz kernel-qcow2-linux-aa2638a210ab0d7c6702cd54315365785fce326c.tar.xz kernel-qcow2-linux-aa2638a210ab0d7c6702cd54315365785fce326c.zip | |
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:
[SCSI] aic79xx: make driver respect nvram for IU and QAS settings
[SCSI] don't attach ULD to Dell Universal Xport
[SCSI] lpfc 8.3.3 : Update driver version to 8.3.3
[SCSI] lpfc 8.3.3 : Add support for Target Reset handler entrypoint
[SCSI] lpfc 8.3.3 : Fix a couple of spin_lock and memory issues and a crash
[SCSI] lpfc 8.3.3 : FC/FCOE discovery fixes
[SCSI] lpfc 8.3.3 : Fix various SLI-3 vs SLI-4 differences
[SCSI] qla2xxx: Resolve a performance issue in interrupt
[SCSI] cnic, bnx2i: Fix build failure when CONFIG_PCI is not set.
[SCSI] nsp_cs: time_out reaches -1
[SCSI] qla2xxx: fix printk format warnings
[SCSI] ncr53c8xx: div reaches -1
[SCSI] compat: don't perform unneeded copy in sg_io code
[SCSI] zfcp: Update FC pass-through support
[SCSI] zfcp: Add FC pass-through support
[SCSI] FC Pass Thru support
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 3b6383168c69..892a9e4e275f 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2272,8 +2272,9 @@ config BNX2 config CNIC tristate "Broadcom CNIC support" - depends on BNX2 - depends on UIO + depends on PCI + select BNX2 + select UIO help This driver supports offload features of Broadcom NetXtremeII gigabit Ethernet cards. |