aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-26 11:42:04 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:40:57 -0700
commitdaa3dfb3461872d9a46394f980ab829e1b223b21 (patch)
tree9d4b1b1c56ef0119348c2f0110da8d4358db6dce /debian.master
parentdfc6642214e23c29ee1001076ba18d2f2b27fa4e (diff)
downloadlinux-linaro-precise-daa3dfb3461872d9a46394f980ab829e1b223b21.tar.gz
UBUNTU: [Config] Enable CONFIG_MTD_DATAFLASH=m on arm
Per the non-modular modules review, enable CONFIG_MTD_DATAFLASH=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 74865c8f4d7..d16afcc0d1a 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -145,7 +145,6 @@ CONFIG_MTD=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_CHAR=m
-CONFIG_MTD_DATAFLASH=m
CONFIG_MTD_GPIO_ADDR=m
CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_BCH=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 62dd5216584..a9b2c005cf0 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -131,7 +131,6 @@ CONFIG_MTD=y
CONFIG_MTD_BLKDEVS=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_CHAR=y
-# CONFIG_MTD_DATAFLASH is not set
# CONFIG_MTD_GPIO_ADDR is not set
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_BCH=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index bc0ac754158..bfcc5147950 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3124,6 +3124,7 @@ CONFIG_MTD_CFI_UTIL=m
CONFIG_MTD_CK804XROM=m
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_DATAFLASH=m
CONFIG_MTD_DATAFLASH_OTP=y
# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
# CONFIG_MTD_DEBUG is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 4eba7bb3252..c70030c4e34 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -143,7 +143,6 @@ CONFIG_MTD=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_CHAR=m
-CONFIG_MTD_DATAFLASH=m
CONFIG_MTD_GPIO_ADDR=m
CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_BCH=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 3fde4839deb..5e7ce8d94a6 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -129,7 +129,6 @@ CONFIG_MTD=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_CHAR=m
-CONFIG_MTD_DATAFLASH=m
CONFIG_MTD_GPIO_ADDR=m
CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_BCH=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index bcddc85f92b..9af49e45f22 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -147,7 +147,6 @@ CONFIG_MTD=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
CONFIG_MTD_CHAR=m
-CONFIG_MTD_DATAFLASH=m
CONFIG_MTD_GPIO_ADDR=m
CONFIG_MTD_NAND=m
CONFIG_MTD_NAND_BCH=m