aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-25 13:38:43 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 08:58:28 -0600
commitc72b65c8a7b0be7e6d7f0e5eba8c83449ccf107a (patch)
tree8bb2925cd26d0db29993eae9583ba9709a004ca1 /debian.master
parent6317a52214326a7de57b6d5f945a2c258f76fb97 (diff)
UBUNTU: [Config] Enable CONFIG_MTD_AR7_PARTS=m on arm
Per the non-modular module review, enable CONFIG_MTD_AR7_PARTS=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.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 54b3abe9351..fe6de9f2cb2 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_AR7_PARTS=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_CHAR=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 555fa94a693..66b9d6018cb 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_AR7_PARTS is not set
CONFIG_MTD_BLKDEVS=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CHAR=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1a8d85a6538..856c439736d 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3059,6 +3059,7 @@ CONFIG_MTD_ABSENT=m
CONFIG_MTD_AFS_PARTS=m
CONFIG_MTD_ALAUDA=m
CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_AR7_PARTS=m
# CONFIG_MTD_ARM_INTEGRATOR is not set
CONFIG_MTD_BLOCK2MTD=m
CONFIG_MTD_BLOCK_RO=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index d680e56a276..b20e15b2231 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_AR7_PARTS=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_CHAR=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 160283fcf72..0587e95ce24 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_AR7_PARTS=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_CHAR=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 9382fa67849..f2da692c7aa 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_AR7_PARTS=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_CHAR=m