---

yaml --- r: 265255 b: refs/heads/master c: 4c78893 h: refs/heads/master i: 265253: 908f5a8 265251: d0fefe6 265247: 656137b v: v3
git-mirror · Aug 12, 2011 · 3d92a07 · 3d92a07
1 parent f62ac8f
commit 3d92a07
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33d480ce6d43326e2541fd79b3548858a174ec3c
+refs/heads/master: 4c78893b3d107e2a053c8f51c526510857c09858
diff --git a/trunk/drivers/scsi/bnx2fc/Kconfig b/trunk/drivers/scsi/bnx2fc/Kconfig
@@ -2,7 +2,8 @@ config SCSI_BNX2X_FCOE
 	tristate "Broadcom NetXtreme II FCoE support"
 	depends on PCI
 	select NETDEVICES
-	select NETDEV_1000
+	select ETHERNET
+	select NET_VENDOR_BROADCOM
 	select LIBFC
 	select LIBFCOE
 	select CNIC

diff --git a/trunk/drivers/scsi/bnx2i/Kconfig b/trunk/drivers/scsi/bnx2i/Kconfig
@@ -4,7 +4,8 @@ config SCSI_BNX2_ISCSI
 	depends on PCI
 	select SCSI_ISCSI_ATTRS
 	select NETDEVICES
-	select NETDEV_1000
+	select ETHERNET
+	select NET_VENDOR_BROADCOM
 	select CNIC
 	---help---
 	This driver supports iSCSI offload for the Broadcom NetXtreme II