From patchwork Mon Apr 2 19:29:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 150239 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 B4CDBB6FBB for ; Tue, 3 Apr 2012 05:29:50 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SEmwi-0007Da-2n; Mon, 02 Apr 2012 19:29:44 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SEmwe-0007A0-BW for kernel-team@lists.ubuntu.com; Mon, 02 Apr 2012 19:29:40 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SEmwe-0001aQ-6O for kernel-team@lists.ubuntu.com; Mon, 02 Apr 2012 19:29:40 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH 7/7] UBUNTU: [Config] Sync dangerous options wrt master Date: Mon, 2 Apr 2012 21:29:32 +0200 Message-Id: <1333394973-14387-8-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1333394973-14387-1-git-send-email-paolo.pisati@canonical.com> References: <1333394973-14387-1-git-send-email-paolo.pisati@canonical.com> 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 Signed-off-by: Paolo Pisati --- debian.ti-omap4/config/config.common.ubuntu | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian.ti-omap4/config/config.common.ubuntu b/debian.ti-omap4/config/config.common.ubuntu index b5ff4f7..3ba5cb9 100644 --- a/debian.ti-omap4/config/config.common.ubuntu +++ b/debian.ti-omap4/config/config.common.ubuntu @@ -1974,7 +1974,7 @@ CONFIG_MMC_SDHCI_PLTFM=m # CONFIG_MMC_SDHCI_PXAV3 is not set # CONFIG_MMC_TEST is not set # CONFIG_MMC_TMIO is not set -CONFIG_MMC_UNSAFE_RESUME=y +# CONFIG_MMC_UNSAFE_RESUME is not set CONFIG_MMC_USHC=m CONFIG_MMC_VUB300=m CONFIG_MMU=y @@ -2096,7 +2096,7 @@ CONFIG_MTD_SLRAM=m # CONFIG_MTD_SM_COMMON is not set CONFIG_MTD_SST25L=m CONFIG_MTD_SWAP=m -CONFIG_MTD_TESTS=m +# CONFIG_MTD_TESTS is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_BEB_RESERVE=1 # CONFIG_MTD_UBI_DEBUG is not set