From patchwork Fri Mar 19 12:46:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 48149 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id ABFE9B7CA6 for ; Fri, 19 Mar 2010 23:46:32 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Nsbau-0007K5-86; Fri, 19 Mar 2010 12:46:28 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1Nsbas-0007Jc-73 for kernel-team@lists.ubuntu.com; Fri, 19 Mar 2010 12:46:26 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1Nsbar-0002Ws-IV for ; Fri, 19 Mar 2010 12:46:25 +0000 Received: from genkt-058-042.t-mobile.co.uk ([149.254.58.42] helo=localhost.localdomain) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1Nsbaq-0007kK-PG for kernel-team@lists.ubuntu.com; Fri, 19 Mar 2010 12:46:25 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/2] UBUNTU: [Config] de-modularise SATA disk controllers Date: Fri, 19 Mar 2010 12:46:19 +0000 Message-Id: <1269002779-11113-3-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1269002779-11113-1-git-send-email-apw@canonical.com> References: <1269002779-11113-1-git-send-email-apw@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com CONFIG_SATA_AHCI=m CONFIG_SATA_INIC162X=m CONFIG_SATA_NV=m CONFIG_SATA_PROMISE=m CONFIG_SATA_QSTOR=m CONFIG_SATA_SIL=m CONFIG_SATA_SIL24=m CONFIG_SATA_SIS=m CONFIG_SATA_SVW=m CONFIG_SATA_SX4=m CONFIG_SATA_ULI=m CONFIG_SATA_VITESSE=m Signed-off-by: Andy Whitcroft Acked-by: Stefan Bader --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/armel/config.common.armel | 1 - debian.master/config/config.common.ubuntu | 23 ++++++++++++----------- debian.master/config/i386/config.common.i386 | 1 - debian.master/config/lpia/config.common.lpia | 1 - 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index a8b3906..110f377 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -113,7 +113,6 @@ CONFIG_RFD_FTL=m CONFIG_RPCSEC_GSS_SPKM3=m CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set -CONFIG_SATA_SX4=y CONFIG_SCSI_ACARD=m CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_OSD_INITIATOR=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index a0a5159..3103939 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -97,7 +97,6 @@ CONFIG_RCU_FANOUT=32 # CONFIG_RFD_FTL is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set CONFIG_RWSEM_GENERIC_SPINLOCK=y -# CONFIG_SATA_SX4 is not set # CONFIG_SCSI_ACARD is not set # CONFIG_SCSI_ADVANSYS is not set # CONFIG_SCSI_NSP32 is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 2ea2383..c1ab99e 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3102,20 +3102,21 @@ CONFIG_RT_MUTEXES=y CONFIG_RXKAD=m CONFIG_S2IO=m # CONFIG_SAMPLES is not set -CONFIG_SATA_AHCI=y -CONFIG_SATA_INIC162X=y +CONFIG_SATA_AHCI=m +CONFIG_SATA_INIC162X=m CONFIG_SATA_MV=m -CONFIG_SATA_NV=y +CONFIG_SATA_NV=m CONFIG_SATA_PMP=y -CONFIG_SATA_PROMISE=y -CONFIG_SATA_QSTOR=y -CONFIG_SATA_SIL=y -CONFIG_SATA_SIL24=y -CONFIG_SATA_SIS=y -CONFIG_SATA_SVW=y -CONFIG_SATA_ULI=y +CONFIG_SATA_PROMISE=m +CONFIG_SATA_QSTOR=m +CONFIG_SATA_SIL=m +CONFIG_SATA_SIL24=m +CONFIG_SATA_SIS=m +CONFIG_SATA_SVW=m +CONFIG_SATA_SX4=m +CONFIG_SATA_ULI=m CONFIG_SATA_VIA=m -CONFIG_SATA_VITESSE=y +CONFIG_SATA_VITESSE=m CONFIG_SBC7240_WDT=m CONFIG_SBC8360_WDT=m CONFIG_SBC_EPX_C3_WATCHDOG=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index e1ee049..feed603 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -113,7 +113,6 @@ CONFIG_RFD_FTL=m CONFIG_RPCSEC_GSS_SPKM3=m # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_SATA_SX4=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_NSP32=m diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia index 816b7dd..ca7f6d1 100644 --- a/debian.master/config/lpia/config.common.lpia +++ b/debian.master/config/lpia/config.common.lpia @@ -123,7 +123,6 @@ CONFIG_RFD_FTL=m CONFIG_RPCSEC_GSS_SPKM3=m # CONFIG_RWSEM_GENERIC_SPINLOCK is not set CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_SATA_SX4=m CONFIG_SCSI_ACARD=m CONFIG_SCSI_ADVANSYS=m CONFIG_SCSI_NSP32=m