diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-30 09:54:25 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-10-17 09:56:16 -0600 |
| commit | 38557501867d36051d6b028db923972f0f9c434e (patch) | |
| tree | 7482d66a5f2f8e331a204c3d79167dc3377e55ef | |
| parent | 969261b37a1aa405cea321ff771173f62a87af39 (diff) | |
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>
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 5fb8a0bcbba..5c63effc347 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -103,7 +103,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 b1964658aa0..051863ad3b6 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -95,7 +95,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 31d69cc7dc1..fccd4d2e14b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2043,6 +2043,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 dc2e046aafe..2dd3914440e 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -104,7 +104,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 ddc79c98978..3f98de20a07 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 351401b3917..a29baaf49e6 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 41ea43c8b24..9ab51073194 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 258f0907fe1..6acc304feaa 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -103,7 +103,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 |