From patchwork Mon Apr 2 19:29:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [7/7] UBUNTU: [Config] Sync dangerous options wrt master From: Paolo Pisati X-Patchwork-Id: 150239 Message-Id: <1333394973-14387-8-git-send-email-paolo.pisati@canonical.com> To: kernel-team@lists.ubuntu.com Date: Mon, 2 Apr 2012 21:29:32 +0200 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