diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-25 13:36:35 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:27 -0600 |
| commit | 6317a52214326a7de57b6d5f945a2c258f76fb97 (patch) | |
| tree | 6acf3afe43a1744945f87a2030536db62ee79a7c /debian.master | |
| parent | 35697c1dd9524191b1dfcc5a1af16bb9804b9cf8 (diff) | |
UBUNTU: [Config] Enable CONFIG_MTD_ALAUDA=m on arm
Per the non-modular module review, enable CONFIG_MTD_ALAUDA=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 3bc343e6404..54b3abe9351 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -140,7 +140,6 @@ CONFIG_MMC_BLOCK=m CONFIG_MMC_SDHCI=m CONFIG_MOXA_SMARTIO=m CONFIG_MTD=m -CONFIG_MTD_ALAUDA=m CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 2536f352c05..555fa94a693 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -127,7 +127,6 @@ CONFIG_MMC_BLOCK=y CONFIG_MMC_SDHCI=y CONFIG_MOXA_SMARTIO=m CONFIG_MTD=y -# CONFIG_MTD_ALAUDA is not set # CONFIG_MTD_AR7_PARTS is not set CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 6a01a189109..1a8d85a6538 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3057,6 +3057,7 @@ CONFIG_MTDRAM_ERASE_SIZE=128 CONFIG_MTDRAM_TOTAL_SIZE=4096 CONFIG_MTD_ABSENT=m CONFIG_MTD_AFS_PARTS=m +CONFIG_MTD_ALAUDA=m CONFIG_MTD_AMD76XROM=m # CONFIG_MTD_ARM_INTEGRATOR is not set CONFIG_MTD_BLOCK2MTD=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 5eae4af5ba0..d680e56a276 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -139,7 +139,6 @@ CONFIG_MMC_BLOCK=m CONFIG_MMC_SDHCI=m CONFIG_MOXA_SMARTIO=m CONFIG_MTD=m -CONFIG_MTD_ALAUDA=m CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 2c34324db0a..160283fcf72 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -125,7 +125,6 @@ CONFIG_MMC_BLOCK=m CONFIG_MMC_SDHCI=m # CONFIG_MOXA_SMARTIO is not set CONFIG_MTD=m -CONFIG_MTD_ALAUDA=m CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index e21bc0a9d82..9382fa67849 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -143,7 +143,6 @@ CONFIG_MMIO_NVRAM=y # CONFIG_MOXA_SMARTIO is not set CONFIG_MPIC_U3_HT_IRQS=y CONFIG_MTD=m -CONFIG_MTD_ALAUDA=m CONFIG_MTD_AR7_PARTS=m CONFIG_MTD_BLKDEVS=m CONFIG_MTD_BLOCK=m |