From patchwork Wed Feb 6 19:59:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 218728 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 981E32C02A1 for ; Thu, 7 Feb 2013 07:00:06 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1U3B9x-0003vB-0p; Wed, 06 Feb 2013 19:59:57 +0000 Received: from mail.tpi.com ([70.99.223.143]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1U3B9u-0003v5-1l for kernel-team@lists.ubuntu.com; Wed, 06 Feb 2013 19:59:54 +0000 Received: from salmon.rtg.net (mail.tpi.com [70.99.223.143]) by mail.tpi.com (Postfix) with ESMTP id C27E632DAB3 for ; Wed, 6 Feb 2013 11:59:52 -0800 (PST) Received: by salmon.rtg.net (Postfix, from userid 1000) id 7805A203BE; Wed, 6 Feb 2013 12:59:52 -0700 (MST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH Quantal SRU] UBUNTU: [Config] CONFIG_SATA_AHCI=m Date: Wed, 6 Feb 2013 12:59:52 -0700 Message-Id: <1360180792-94990-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 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 BugLink: http://bugs.launchpad.net/bugs/1056563 Signed-off-by: Tim Gardner --- debian.master/config/config.common.ubuntu | 2 +- debian.master/control.d/generic.inclusion-list | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 1e13e65..bcc55f5 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4614,7 +4614,7 @@ CONFIG_S2IO=m CONFIG_SAMSUNG_LAPTOP=m CONFIG_SAMSUNG_Q10=m CONFIG_SATA_ACARD_AHCI=m -CONFIG_SATA_AHCI=y +CONFIG_SATA_AHCI=m CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SATA_HIGHBANK=y CONFIG_SATA_INIC162X=m diff --git a/debian.master/control.d/generic.inclusion-list b/debian.master/control.d/generic.inclusion-list index 49258b8..0478c07 100644 --- a/debian.master/control.d/generic.inclusion-list +++ b/debian.master/control.d/generic.inclusion-list @@ -1,6 +1,10 @@ arch/*/{crypto,kernel,oprofile} crypto/* drivers/acpi/* +drivers/ata/ahci_platform.ko +drivers/ata/ahci.ko +drivers/ata/acard-ahci.ko +drivers/ata/libahci.ko drivers/block/nbd.ko drivers/block/floppy.ko drivers/block/cryptoloop.ko