From patchwork Mon Jul  9 08:06:27 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Bryan Wu <bryan.wu@canonical.com>
X-Patchwork-Id: 169707
Return-Path: <kernel-team-bounces@lists.ubuntu.com>
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 B0BD32C0223
	for <incoming@patchwork.ozlabs.org>;
	Mon,  9 Jul 2012 18:07:10 +1000 (EST)
Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com)
	by chlorine.canonical.com with esmtp (Exim 4.71)
	(envelope-from <kernel-team-bounces@lists.ubuntu.com>)
	id 1So8zo-0002Up-7J; Mon, 09 Jul 2012 08:07:04 +0000
Received: from youngberry.canonical.com ([91.189.89.112])
	by chlorine.canonical.com with esmtp (Exim 4.71)
	(envelope-from <bryan.wu@canonical.com>) id 1So8zm-0002Se-RM
	for kernel-team@lists.ubuntu.com; Mon, 09 Jul 2012 08:07:02 +0000
Received: from [101.224.51.72] (helo=canonical.com)
	by youngberry.canonical.com with esmtpsa
	(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71)
	(envelope-from <bryan.wu@canonical.com>)
	id 1So8zm-0005d0-01; Mon, 09 Jul 2012 08:07:02 +0000
From: Bryan Wu <bryan.wu@canonical.com>
To: tim.gardner@canonical.com, apw@canonical.com,
	kernel-team@lists.ubuntu.com, paolo.pisati@canonical.com
Subject: [PATCH 2/2] UBUNTU: [Config] set CONFIG_SATA_AHCI_PLATFORM as module
	follow the policy in master branch
Date: Mon,  9 Jul 2012 16:06:27 +0800
Message-Id: <1341821188-4994-3-git-send-email-bryan.wu@canonical.com>
X-Mailer: git-send-email 1.7.11.1
In-Reply-To: <1341821188-4994-1-git-send-email-bryan.wu@canonical.com>
References: <1341821188-4994-1-git-send-email-bryan.wu@canonical.com>
X-BeenThere: kernel-team@lists.ubuntu.com
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com>
List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>,
	<mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe>
List-Archive: <https://lists.ubuntu.com/archives/kernel-team>
List-Post: <mailto:kernel-team@lists.ubuntu.com>
List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help>
List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>,
	<mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe>
MIME-Version: 1.0
Sender: kernel-team-bounces@lists.ubuntu.com
Errors-To: kernel-team-bounces@lists.ubuntu.com

Signed-off-by: Bryan Wu <bryan.wu@canonical.com>

diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu
index df3817d..1fee5a1 100644
--- a/debian.ti-omap4/config/config.common.ubuntu
+++ b/debian.ti-omap4/config/config.common.ubuntu
@@ -2919,7 +2919,7 @@ CONFIG_RT_MUTEXES=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_RXKAD=m
 # CONFIG_SAMPLES is not set
-# CONFIG_SATA_AHCI_PLATFORM is not set
+CONFIG_SATA_AHCI_PLATFORM=m
 CONFIG_SATA_MV=m
 CONFIG_SATA_PMP=y
 CONFIG_SCHEDSTATS=y