aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-25 13:36:35 -0700
committerLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-30 14:34:17 -0700
commit33bf0ccb88990a6c18e7471a8c7c6944610b0345 (patch)
tree9d0572f0d58a3853ebd2cad4d83775623706b716
parent03ceef275f2294d16b65ef834a9da135ce27178d (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>
-rw-r--r--debian.master/config/amd64/config.common.amd641
-rw-r--r--debian.master/config/armel/config.common.armel1
-rw-r--r--debian.master/config/config.common.ubuntu1
-rw-r--r--debian.master/config/i386/config.common.i3861
-rw-r--r--debian.master/config/powerpc/config.common.powerpc1
-rw-r--r--debian.master/config/ppc64/config.common.ppc641
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