diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-26 13:05:52 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:41:06 -0700 |
| commit | a5917e5203f3f695e49c7ca80a6956ff94e9704d (patch) | |
| tree | 62f206ba0a2c06627765705e4c9ccc8c6c40854f /debian.master | |
| parent | 9e21b2b75a4a25e0120fb5d7be8fb316a1caadd8 (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>
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 64528b8b2c7..e397638bafa 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -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=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 c5752561a97..e331dd04436 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -136,7 +136,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 dd65a6054bc..ddd11b3323b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3207,6 +3207,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 cb5d434de1f..a87fe46914a 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -148,7 +148,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 ffa1544e039..9620d1a94cd 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -134,7 +134,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 a30c7b51801..37e334b4a6e 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -152,7 +152,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 |