From 51ad85b504e490578676c75d591d3781eecb6ad7 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 11 Aug 2011 22:59:31 -0700 Subject: [PATCH] --- yaml --- r: 265239 b: refs/heads/master c: f08e6c0a87db74397ddbcca7cb189d50310d8ddf h: refs/heads/master i: 265237: 24f18feef0de6be30a4039bdee90b58369234e8e 265235: bd2c77dd22d9ff85a598fb20cecde28678f03d72 265231: 87ebdf6b47a4a73d7111cc8752fe92d70ee26615 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/cxgbi/cxgb3i/Kconfig | 3 ++- trunk/drivers/scsi/cxgbi/cxgb4i/Kconfig | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index df1fb49fe043..3d3168587fd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b133ad6e9e96798007e64eb912c42fa00adef0a +refs/heads/master: f08e6c0a87db74397ddbcca7cb189d50310d8ddf diff --git a/trunk/drivers/scsi/cxgbi/cxgb3i/Kconfig b/trunk/drivers/scsi/cxgbi/cxgb3i/Kconfig index 11dff23f7838..6bbc36fbd6ec 100644 --- a/trunk/drivers/scsi/cxgbi/cxgb3i/Kconfig +++ b/trunk/drivers/scsi/cxgbi/cxgb3i/Kconfig @@ -2,7 +2,8 @@ config SCSI_CXGB3_ISCSI tristate "Chelsio T3 iSCSI support" depends on PCI && INET select NETDEVICES - select NETDEV_10000 + select ETHERNET + select NET_VENDOR_CHELSIO select CHELSIO_T3 select SCSI_ISCSI_ATTRS ---help--- diff --git a/trunk/drivers/scsi/cxgbi/cxgb4i/Kconfig b/trunk/drivers/scsi/cxgbi/cxgb4i/Kconfig index d5302c27f377..16b2c7d26617 100644 --- a/trunk/drivers/scsi/cxgbi/cxgb4i/Kconfig +++ b/trunk/drivers/scsi/cxgbi/cxgb4i/Kconfig @@ -2,7 +2,8 @@ config SCSI_CXGB4_ISCSI tristate "Chelsio T4 iSCSI support" depends on PCI && INET select NETDEVICES - select NETDEV_10000 + select ETHERNET + select NET_VENDOR_CHELSIO select CHELSIO_T4 select SCSI_ISCSI_ATTRS ---help---