aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-26 12:59:13 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:41:04 -0700
commit8873eb77959744208d9f49345bee29fb86fd0d6c (patch)
tree1b4c138db1b51dca49a508fee840f828632f5060 /debian.master
parenta4d0010bb12b204c9d0e8de5ddc977b2733ddc86 (diff)
downloadlinux-linaro-precise-8873eb77959744208d9f49345bee29fb86fd0d6c.tar.gz
UBUNTU: [Config] Enable CONFIG_MTD_NAND_PLATFORM=m on arm
Per the non-modular module review, enable CONFIG_MTD_NAND_PLATFORM=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 c636f648ed2..64528b8b2c7 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -149,7 +149,6 @@ CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_BCH=m
CONFIG_MTD_NAND_ECC=m
CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_PLATFORM=m
CONFIG_MTD_SM_COMMON=m
CONFIG_MTD_SST25L=m
CONFIG_MUTEX_SPIN_ON_OWNER=y
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index c651a7b5d1f..c5752561a97 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -135,7 +135,6 @@ CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_BCH=y
CONFIG_MTD_NAND_ECC=y
CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_PLATFORM is not set
# CONFIG_MTD_SM_COMMON is not set
# CONFIG_MTD_SST25L is not set
# CONFIG_MUTEX_SPIN_ON_OWNER is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 4ad0eb2c0f0..83da6d03266 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3169,6 +3169,7 @@ CONFIG_MTD_NAND_GPIO=m
CONFIG_MTD_NAND_NANDSIM=m
CONFIG_MTD_NAND_OMAP2=y
CONFIG_MTD_NAND_PASEMI=m
+CONFIG_MTD_NAND_PLATFORM=m
CONFIG_MTD_NAND_RICOH=m
# CONFIG_MTD_NAND_TMIO is not set
# CONFIG_MTD_NAND_VERIFY_WRITE is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 34f935db931..cb5d434de1f 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -147,7 +147,6 @@ CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_BCH=m
CONFIG_MTD_NAND_ECC=m
CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_PLATFORM=m
CONFIG_MTD_SM_COMMON=m
CONFIG_MTD_SST25L=m
CONFIG_MUTEX_SPIN_ON_OWNER=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 04bbcfc9000..ffa1544e039 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -133,7 +133,6 @@ CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_BCH=m
CONFIG_MTD_NAND_ECC=m
CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_PLATFORM=m
CONFIG_MTD_SM_COMMON=m
CONFIG_MTD_SST25L=m
CONFIG_NATIONAL_PHY=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 9e50065149f..a30c7b51801 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -151,7 +151,6 @@ CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_BCH=m
CONFIG_MTD_NAND_ECC=m
CONFIG_MTD_NAND_IDS=m
-CONFIG_MTD_NAND_PLATFORM=m
CONFIG_MTD_SM_COMMON=m
CONFIG_MTD_SST25L=m
CONFIG_MUTEX_SPIN_ON_OWNER=y