diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-26 12:53:34 -0700 |
|---|---|---|
| committer | Linaro CI <john.rigby@linaro.org> | 2012-02-07 22:49:28 +0000 |
| commit | 7f5f592ff9492c7ac0aac4f4b3b6732b28c75e64 (patch) | |
| tree | ab0d51b1d4bd8c25fed9faab9ce34ac588c20a1d /debian.master | |
| parent | 118150e9c317b4acdb9616999e907e9db8cdf46b (diff) | |
UBUNTU: [Config] Enable CONFIG_MTD_NAND_NANDSIM=m on arm
Per the non-modular module review, enable CONFIG_MTD_NAND_NANDSIM=m on
arm for consistency across all flavors.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian.master')
| -rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 1 | ||||
| -rw-r--r-- | debian.master/config/armel/config.common.armel | 1 | ||||
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 1 | ||||
| -rw-r--r-- | debian.master/config/i386/config.common.i386 | 1 | ||||
| -rw-r--r-- | debian.master/config/powerpc/config.common.powerpc | 1 | ||||
| -rw-r--r-- | debian.master/config/ppc64/config.common.ppc64 | 1 |
6 files changed, 1 insertions, 5 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index ea8a723302f..c636f648ed2 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -149,7 +149,6 @@ CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_NANDSIM=m CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SST25L=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index c70282c8917..c651a7b5d1f 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -135,7 +135,6 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_BCH=y CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_IDS=y -# CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_SM_COMMON is not set # CONFIG_MTD_SST25L is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index e8c041ac047..d4db112f1ad 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3166,6 +3166,7 @@ CONFIG_MTD_NAND_ECC_BCH=y # CONFIG_MTD_NAND_FSL_ELBC is not set CONFIG_MTD_NAND_GPIO=m # CONFIG_MTD_NAND_MUSEUM_IDS is not set +CONFIG_MTD_NAND_NANDSIM=m CONFIG_MTD_NAND_OMAP2=y # CONFIG_MTD_NAND_PASEMI is not set CONFIG_MTD_NAND_RICOH=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index f1d2010b630..34f935db931 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -147,7 +147,6 @@ CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_NANDSIM=m CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SST25L=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 0ede98115e3..04bbcfc9000 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -133,7 +133,6 @@ CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_NANDSIM=m CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SST25L=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index fe948f6ad16..9e50065149f 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -151,7 +151,6 @@ CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_NANDSIM=m CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SST25L=m |