aboutsummaryrefslogtreecommitdiff
path: root/debian.master
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2011-08-30 09:54:25 -0700
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:41:17 -0700
commite00b5b62802ba76e5b6849eb26233722efe16924 (patch)
tree137a14d2b9f722ea39ecfc3567c8878b6ba5280b /debian.master
parentb5f62b61beb9eea398014f782e716fa349a44752 (diff)
downloadlinux-linaro-precise-e00b5b62802ba76e5b6849eb26233722efe16924.tar.gz
UBUNTU: [Config] Enable CONFIG_I2C_GPIO=m on powerpc64-smp
Per the non-modular module review, enable CONFIG_I2C_GPIO=m on powerpc64-smp 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.flavour.powerpc1
-rw-r--r--debian.master/config/powerpc/config.flavour.powerpc-smp1
-rw-r--r--debian.master/config/powerpc/config.flavour.powerpc64-smp1
-rw-r--r--debian.master/config/ppc64/config.common.ppc641
8 files changed, 1 insertions, 7 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index d74991015b6..c4f128a9517 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -105,7 +105,6 @@ CONFIG_HZ=100
CONFIG_HZ_100=y
# CONFIG_HZ_250 is not set
CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_GPIO=m
# CONFIG_I2C_HELPER_AUTO is not set
CONFIG_I2C_I801=m
# CONFIG_I2C_PXA_PCI is not set
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 9813fd47735..a50de88f54b 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -96,7 +96,6 @@ CONFIG_HAVE_GENERIC_DMA_COHERENT=y
# CONFIG_HUGETLB_PAGE is not set
CONFIG_HZ=128
CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_GPIO=m
# CONFIG_I2C_HELPER_AUTO is not set
# CONFIG_I2C_I801 is not set
# CONFIG_I2C_PXA_PCI is not set
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 7c6c5f14aef..afb7e36ec00 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2075,6 +2075,7 @@ CONFIG_I2C_COMPAT=y
CONFIG_I2C_DESIGNWARE=m
CONFIG_I2C_DIOLAN_U2C=m
CONFIG_I2C_EG20T=m
+CONFIG_I2C_GPIO=m
CONFIG_I2C_HYDRA=m
CONFIG_I2C_INTEL_MID=m
CONFIG_I2C_ISCH=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index 8bb96a0019a..74fc8a7d2c3 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -105,7 +105,6 @@ CONFIG_HZ=250
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_GPIO=m
# CONFIG_I2C_HELPER_AUTO is not set
CONFIG_I2C_I801=m
CONFIG_ICPLUS_PHY=y
diff --git a/debian.master/config/powerpc/config.flavour.powerpc b/debian.master/config/powerpc/config.flavour.powerpc
index 885442edf8f..3ea8205fdd5 100644
--- a/debian.master/config/powerpc/config.flavour.powerpc
+++ b/debian.master/config/powerpc/config.flavour.powerpc
@@ -16,7 +16,6 @@ CONFIG_FORCE_MAX_ZONEORDER=11
# CONFIG_GENERIC_TBSYNC is not set
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
# CONFIG_HUGETLB_PAGE is not set
-CONFIG_I2C_GPIO=m
CONFIG_KERNEL_START=0xc0000000
CONFIG_KGDB=y
CONFIG_LATENCYTOP=y
diff --git a/debian.master/config/powerpc/config.flavour.powerpc-smp b/debian.master/config/powerpc/config.flavour.powerpc-smp
index 2e0d794db20..0a267f4b200 100644
--- a/debian.master/config/powerpc/config.flavour.powerpc-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc-smp
@@ -16,7 +16,6 @@ CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_GENERIC_TBSYNC=y
# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
# CONFIG_HUGETLB_PAGE is not set
-CONFIG_I2C_GPIO=m
CONFIG_KERNEL_START=0xc0000000
# CONFIG_KGDB is not set
# CONFIG_LATENCYTOP is not set
diff --git a/debian.master/config/powerpc/config.flavour.powerpc64-smp b/debian.master/config/powerpc/config.flavour.powerpc64-smp
index c5a60ddbcfe..bb07f663445 100644
--- a/debian.master/config/powerpc/config.flavour.powerpc64-smp
+++ b/debian.master/config/powerpc/config.flavour.powerpc64-smp
@@ -16,7 +16,6 @@ CONFIG_FORCE_MAX_ZONEORDER=13
CONFIG_GENERIC_TBSYNC=y
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_HUGETLB_PAGE=y
-# CONFIG_I2C_GPIO is not set
CONFIG_KERNEL_START=0xc000000000000000
CONFIG_KGDB=y
CONFIG_LATENCYTOP=y
diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64
index 6006e863a17..1e26945935b 100644
--- a/debian.master/config/ppc64/config.common.ppc64
+++ b/debian.master/config/ppc64/config.common.ppc64
@@ -104,7 +104,6 @@ CONFIG_HZ=250
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
CONFIG_I2C_ALGOBIT=y
-# CONFIG_I2C_GPIO is not set
CONFIG_I2C_HELPER_AUTO=y
CONFIG_I2C_I801=m
# CONFIG_I2C_PXA_PCI is not set