diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-26 11:45:58 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-12 09:11:23 -0600 |
| commit | 8579006cea1e7b3054f32a8695f736814ef5ac8a (patch) | |
| tree | bc57aa112add5acd86844d806add879ad5d99e76 /debian.master | |
| parent | 80aa44ddb24c51b22da38cf9f5c0f33420de5783 (diff) | |
UBUNTU: [Config] Enable CONFIG_MTD_GPIO_ADDR=m on arm
Per the non-modular module review, enable CONFIG_MTD_GPIO_ADDR=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 c0834d66dbe..b1befd8f854 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_GPIO_ADDR=m CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 568dae089f2..ba9326a0a6e 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_GPIO_ADDR is not set CONFIG_MTD_NAND=y CONFIG_MTD_NAND_BCH=y CONFIG_MTD_NAND_ECC=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 969fd613891..c3497cde8cf 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3090,6 +3090,7 @@ CONFIG_MTD_DOCPROBE_ADDRESS=0 # CONFIG_MTD_DOCPROBE_ADVANCED is not set CONFIG_MTD_ESB2ROM=m CONFIG_MTD_GEN_PROBE=m +CONFIG_MTD_GPIO_ADDR=m CONFIG_MTD_ICHXROM=m # CONFIG_MTD_IMPA7 is not set CONFIG_MTD_INTEL_VR_NOR=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 2dc4adfeef5..a864dfec748 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_GPIO_ADDR=m CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index d211f4118d3..6b22cf757a2 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_GPIO_ADDR=m CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 7bb9ddeb6ea..53d0e6f3195 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_GPIO_ADDR=m CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m |