aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-26 11:37:02 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:40:56 -0700
commitdfc6642214e23c29ee1001076ba18d2f2b27fa4e (patch)
tree934911b40c5fd67dd91618bd016178096f0cc394 /debian.master
parent1b3ef3824b5dbfb784aee6a8bed5b16263df4edd (diff)
downloadlinux-linaro-precise-dfc6642214e23c29ee1001076ba18d2f2b27fa4e.tar.gz
UBUNTU: [Config] Enable CONFIG_MOXA_SMARTIO=m on powerpc
Per the non-modular module review, enable CONFIG_MOXA_SMARTIO=m on powerpc 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 27fa429b960..74865c8f4d7 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -141,7 +141,6 @@ CONFIG_MFD_JANZ_CMODIO=m
CONFIG_MMC=y
CONFIG_MMC_BLOCK=m
CONFIG_MMC_SDHCI=m
-CONFIG_MOXA_SMARTIO=m
CONFIG_MTD=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 2ba56d5fb7b..62dd5216584 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -127,7 +127,6 @@ CONFIG_MFD_TMIO=y
CONFIG_MMC=y
CONFIG_MMC_BLOCK=y
CONFIG_MMC_SDHCI=y
-CONFIG_MOXA_SMARTIO=m
CONFIG_MTD=y
CONFIG_MTD_BLKDEVS=y
CONFIG_MTD_BLOCK=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 1eafcd4c38c..bc0ac754158 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -3086,6 +3086,7 @@ CONFIG_MOUSE_SERIAL=m
CONFIG_MOUSE_SYNAPTICS_I2C=m
CONFIG_MOUSE_VSXXXAA=m
CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
# CONFIG_MPENTIUM4 is not set
# CONFIG_MPENTIUMII is not set
# CONFIG_MPENTIUMIII is not set
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index fc2fea55c85..4eba7bb3252 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -139,7 +139,6 @@ CONFIG_MFD_JANZ_CMODIO=m
CONFIG_MMC=y
CONFIG_MMC_BLOCK=m
CONFIG_MMC_SDHCI=m
-CONFIG_MOXA_SMARTIO=m
CONFIG_MTD=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 4d9692628c6..3fde4839deb 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -125,7 +125,6 @@ CONFIG_MFD_JANZ_CMODIO=m
CONFIG_MMC=m
CONFIG_MMC_BLOCK=m
CONFIG_MMC_SDHCI=m
-# CONFIG_MOXA_SMARTIO is not set
CONFIG_MTD=m
CONFIG_MTD_BLKDEVS=m
CONFIG_MTD_BLOCK=m
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 1b8fcec5a22..bcddc85f92b 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -142,7 +142,6 @@ CONFIG_MMC=m
CONFIG_MMC_BLOCK=m
CONFIG_MMC_SDHCI=m
CONFIG_MMIO_NVRAM=y
-# CONFIG_MOXA_SMARTIO is not set
CONFIG_MPIC_U3_HT_IRQS=y
CONFIG_MTD=m
CONFIG_MTD_BLKDEVS=m