aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-25 13:41:46 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-09-23 08:58:30 -0600
commit5cfe939eb1b4103f89145c607bdf6a16f8b5368e (patch)
treedf2581021a87644628b2c142dc6485d45c9bc414 /debian.master
parentc72b65c8a7b0be7e6d7f0e5eba8c83449ccf107a (diff)
UBUNTU: [Config] Enable CONFIG_MTD_ARM_INTEGRATOR=m on arm
Per the non-modular module review, enable CONFIG_MTD_ARM_INTEGRATOR=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/config.common.ubuntu2
1 files changed, 1 insertions, 1 deletions
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 856c439736d..8d7b9dcce23 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3060,7 +3060,7 @@ CONFIG_MTD_AFS_PARTS=m
CONFIG_MTD_ALAUDA=m
CONFIG_MTD_AMD76XROM=m
CONFIG_MTD_AR7_PARTS=m
-# CONFIG_MTD_ARM_INTEGRATOR is not set
+CONFIG_MTD_ARM_INTEGRATOR=m
CONFIG_MTD_BLOCK2MTD=m
CONFIG_MTD_BLOCK_RO=m
CONFIG_MTD_CFI=m