diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-26 11:45:58 -0700 |
|---|---|---|
| committer | Linaro CI <john.rigby@linaro.org> | 2012-02-07 22:49:23 +0000 |
| commit | f8c0326d612a71d438c59ee7b186e5f126d158c7 (patch) | |
| tree | 5e28bdef25648e7cf8d00fac976750cd274d066e /debian.master | |
| parent | 18f4e6f154df1400d654e4fb87668a264bdb6217 (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 d16afcc0d1a..ea8a723302f 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_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 a9b2c005cf0..c70282c8917 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_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 bfcc5147950..e10c79f93d5 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3137,6 +3137,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 c70030c4e34..f1d2010b630 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_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 5e7ce8d94a6..0ede98115e3 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_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 9af49e45f22..fe948f6ad16 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_GPIO_ADDR=m CONFIG_MTD_NAND=m CONFIG_MTD_NAND_BCH=m CONFIG_MTD_NAND_ECC=m |