From 3d92a07647f4df62df1bb77005d80c5ced06c8c1 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Fri, 12 Aug 2011 03:00:47 -0700 Subject: [PATCH] --- yaml --- r: 265255 b: refs/heads/master c: 4c78893b3d107e2a053c8f51c526510857c09858 h: refs/heads/master i: 265253: 908f5a8c0845484d78aca02e7e0f3515fc7e0cde 265251: d0fefe6d76f53f58ec3b7e9f01d09a438454d278 265247: 656137b0858ff62519e2b76912e049c979e56a64 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/bnx2fc/Kconfig | 3 ++- trunk/drivers/scsi/bnx2i/Kconfig | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4260e3290250..bb318b2484c8 100644 --- 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 index 6a38080e35ed..cfcad8bde7cf 100644 --- 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 index 45a6154ce972..01cff1894b6d 100644 --- 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