Patchwork [7/7] UBUNTU: [Config] Sync dangerous options wrt master

login
register
mail settings
Submitter Paolo Pisati
Date April 2, 2012, 7:29 p.m.
Message ID <1333394973-14387-8-git-send-email-paolo.pisati@canonical.com>
Download mbox | patch
Permalink /patch/150239/
State New
Headers show

Comments

Paolo Pisati - April 2, 2012, 7:29 p.m.
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 debian.ti-omap4/config/config.common.ubuntu |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

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