diff options
author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-26 12:59:13 -0700 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:52 -0600 |
commit | f8c962b1629806e23c11088ec9ac0f213261bad4 (patch) | |
tree | 2b40f4eb4632c5bc10744c4babf8698719effe0f /debian.master | |
parent | 4ba1ea2164cd4c75cb5a86f4a0efa86a0fab0e33 (diff) |
UBUNTU: [Config] Enable CONFIG_MTD_NAND_PLATFORM=m on arm
Per the non-modular module review, enable CONFIG_MTD_NAND_PLATFORM=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 0fb8958c683..bb312475377 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -146,7 +146,6 @@ CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SST25L=m CONFIG_MUTEX_SPIN_ON_OWNER=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 76262875737..19cbea0e62a 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -133,7 +133,6 @@ CONFIG_MTD_NAND=y CONFIG_MTD_NAND_BCH=y CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_IDS=y -# CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_SM_COMMON is not set # CONFIG_MTD_SST25L is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 6a68029ce2f..d6c01a51f5e 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3122,6 +3122,7 @@ CONFIG_MTD_NAND_GPIO=m CONFIG_MTD_NAND_NANDSIM=m CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_PASEMI=m +CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_NAND_RICOH=m # CONFIG_MTD_NAND_TMIO is not set # CONFIG_MTD_NAND_VERIFY_WRITE is not set diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 5e6843ed1b0..c169f3a47da 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -145,7 +145,6 @@ CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SST25L=m CONFIG_MUTEX_SPIN_ON_OWNER=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 1e6788d93bf..aeef4169911 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -131,7 +131,6 @@ CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m -CONFIG_MTD_NAND_PLATFORM=m CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SST25L=m CONFIG_NATIONAL_PHY=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 6ca0e9ddeec..db1feb13702 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -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_PLATFORM=m CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SST25L=m CONFIG_MUTEX_SPIN_ON_OWNER=y |