diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-26 11:42:04 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:58:41 -0600 |
| commit | 291a07195d050884af078c26514c8082ccbfd27d (patch) | |
| tree | 62ffb47ba4292bca588a388724902468ce05a8bf /debian.master | |
| parent | 4be893c6078fa888775c0b244fbeb7f5cb0e41e2 (diff) | |
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.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 4f35846bffa..c0834d66dbe 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -142,7 +142,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 a13a2dad58b..568dae089f2 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -129,7 +129,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 1202a19e0cb..969fd613891 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3077,6 +3077,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 da482c9fa08..2dc4adfeef5 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -141,7 +141,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 243ffe29997..d211f4118d3 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -127,7 +127,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 9a089e81427..7bb9ddeb6ea 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -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 |