diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-26 13:05:52 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:55 -0600 |
| commit | 0b09b0c2285162c32468b1b7ba29fe86cf22158b (patch) | |
| tree | 5c3817b996bdd7cfeb4c1deb97873c5d858843a4 | |
| parent | 9db0579ea99a0b2ce9f46fa3ebcf18bd125fd728 (diff) | |
UBUNTU: [Config] Enable CONFIG_MTD_SST25L=m on arm
Per the non-modular module review, enable CONFIG_MTD_SST25L=m on arm for
consistency across all flavors.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -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 bb312475377..e5771436e83 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -147,7 +147,6 @@ CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m CONFIG_MTD_SM_COMMON=m -CONFIG_MTD_SST25L=m CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NATIONAL_PHY=y CONFIG_NEED_DMA_MAP_STATE=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 19cbea0e62a..a2a3ef3fdbf 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -134,7 +134,6 @@ CONFIG_MTD_NAND_BCH=y CONFIG_MTD_NAND_ECC=y CONFIG_MTD_NAND_IDS=y # CONFIG_MTD_SM_COMMON is not set -# CONFIG_MTD_SST25L is not set # CONFIG_MUTEX_SPIN_ON_OWNER is not set CONFIG_NATIONAL_PHY=y CONFIG_NEED_DMA_MAP_STATE=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index c7c606735b0..e48577ca57b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3160,6 +3160,7 @@ CONFIG_MTD_SC520CDP=m CONFIG_MTD_SCB2_FLASH=m CONFIG_MTD_SCx200_DOCFLASH=m CONFIG_MTD_SLRAM=m +CONFIG_MTD_SST25L=m CONFIG_MTD_SWAP=m CONFIG_MTD_TESTS=m CONFIG_MTD_TS5500=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index c169f3a47da..383d604e18c 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -146,7 +146,6 @@ CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m CONFIG_MTD_SM_COMMON=m -CONFIG_MTD_SST25L=m CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NATIONAL_PHY=y CONFIG_NEED_DMA_MAP_STATE=y diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index aeef4169911..fceb0a9a006 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -132,7 +132,6 @@ CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m CONFIG_MTD_SM_COMMON=m -CONFIG_MTD_SST25L=m CONFIG_NATIONAL_PHY=m CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_FLOW=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index db1feb13702..7b73a525924 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -150,7 +150,6 @@ CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m CONFIG_MTD_NAND_IDS=m CONFIG_MTD_SM_COMMON=m -CONFIG_MTD_SST25L=m CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NATIONAL_PHY=m CONFIG_NEED_DMA_MAP_STATE=y |