From patchwork Thu Feb 17 13:29:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 83452 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8EBFDB710A for ; Fri, 18 Feb 2011 00:28:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756384Ab1BQN2n (ORCPT ); Thu, 17 Feb 2011 08:28:43 -0500 Received: from vpn.id2.novell.com ([195.33.99.129]:46323 "EHLO vpn.id2.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756334Ab1BQN2m convert rfc822-to-8bit (ORCPT ); Thu, 17 Feb 2011 08:28:42 -0500 Received: from EMEA1-MTA by vpn.id2.novell.com with Novell_GroupWise; Thu, 17 Feb 2011 13:28:38 +0000 Message-Id: <4D5D30CA020000780003263A@vpn.id2.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.1 Date: Thu, 17 Feb 2011 13:29:30 +0000 From: "Jan Beulich" To: , Cc: , Subject: [PATCH] cxgb{3,4}: streamline Kconfig options Mime-Version: 1.0 Content-Disposition: inline Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The CHELSIO_T{3,4}_DEPENDS options are really awkward, and can be easily dropped if the reverse dependencies of SCSI_CXGB{3,4}_ISCSI on the former get converted to normal (forward) ones referring to CHELSIO_T{3,4}. Signed-off-by: Jan Beulich --- drivers/net/Kconfig | 14 ++------------ drivers/scsi/cxgbi/cxgb3i/Kconfig | 3 +-- drivers/scsi/cxgbi/cxgb4i/Kconfig | 3 +-- 3 files changed, 4 insertions(+), 16 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 2.6.38-rc5/drivers/net/Kconfig +++ 2.6.38-rc5-kconfig-chelsio/drivers/net/Kconfig @@ -2594,14 +2594,9 @@ config CHELSIO_T1_1G Enables support for Chelsio's gigabit Ethernet PCI cards. If you are using only 10G cards say 'N' here. -config CHELSIO_T3_DEPENDS - tristate - depends on PCI && INET - default y - config CHELSIO_T3 tristate "Chelsio Communications T3 10Gb Ethernet support" - depends on CHELSIO_T3_DEPENDS + depends on PCI && INET select FW_LOADER select MDIO help @@ -2619,14 +2614,9 @@ config CHELSIO_T3 To compile this driver as a module, choose M here: the module will be called cxgb3. -config CHELSIO_T4_DEPENDS - tristate - depends on PCI && INET - default y - config CHELSIO_T4 tristate "Chelsio Communications T4 Ethernet support" - depends on CHELSIO_T4_DEPENDS + depends on PCI && INET select FW_LOADER select MDIO help --- 2.6.38-rc5/drivers/scsi/cxgbi/cxgb3i/Kconfig +++ 2.6.38-rc5-kconfig-chelsio/drivers/scsi/cxgbi/cxgb3i/Kconfig @@ -1,7 +1,6 @@ config SCSI_CXGB3_ISCSI tristate "Chelsio T3 iSCSI support" - depends on CHELSIO_T3_DEPENDS - select CHELSIO_T3 + depends on CHELSIO_T3 select SCSI_ISCSI_ATTRS ---help--- This driver supports iSCSI offload for the Chelsio T3 devices. --- 2.6.38-rc5/drivers/scsi/cxgbi/cxgb4i/Kconfig +++ 2.6.38-rc5-kconfig-chelsio/drivers/scsi/cxgbi/cxgb4i/Kconfig @@ -1,7 +1,6 @@ config SCSI_CXGB4_ISCSI tristate "Chelsio T4 iSCSI support" - depends on CHELSIO_T4_DEPENDS - select CHELSIO_T4 + depends on CHELSIO_T4 select SCSI_ISCSI_ATTRS ---help--- This driver supports iSCSI offload for the Chelsio T4 devices.