diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-24 12:43:42 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:57:51 -0600 |
| commit | c75c0fe2bf096a44f78acf16bdea8b636447927c (patch) | |
| tree | 9232e0f84d04a210dcfe80f1e0700c4acb46066c /debian.master | |
| parent | c3aebe86370b49c35202a864352cae54965b9612 (diff) | |
UBUNTU: [Config] Enable CONFIG_IGB=m on powerpc
Per the non-modular module review, eanble CONFIG_IGB=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.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 12f8095c7b1..655a692e651 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -109,7 +109,6 @@ CONFIG_I2C_I801=m # CONFIG_I2C_PXA_PCI is not set CONFIG_ICPLUS_PHY=y # CONFIG_IDE is not set -CONFIG_IGB=m CONFIG_IIO=m CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_INTEL_TXT=y diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index f4fd27e5a33..e268c039308 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -101,7 +101,6 @@ CONFIG_I2C_GPIO=m # CONFIG_I2C_PXA_PCI is not set CONFIG_ICPLUS_PHY=y # CONFIG_IDE is not set -CONFIG_IGB=m CONFIG_IIO=m # CONFIG_INTR_REMAP is not set # CONFIG_IPMI_HANDLER is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index b79366c78bc..91ee3c256c3 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2134,6 +2134,7 @@ CONFIG_IEEE802154=m CONFIG_IEEE802154_DRIVERS=m # CONFIG_IEEE802154_FAKEHARD is not set CONFIG_IFB=m +CONFIG_IGB=m CONFIG_IGBVF=m CONFIG_IGB_DCA=y CONFIG_IIO_CONSUMERS_PER_TRIGGER=2 diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 6664c4929be..6bbdd0a7399 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -109,7 +109,6 @@ CONFIG_I2C_GPIO=m CONFIG_I2C_I801=m CONFIG_ICPLUS_PHY=y # CONFIG_IDE is not set -CONFIG_IGB=m CONFIG_IIO=m CONFIG_ILLEGAL_POINTER_VALUE=0 # CONFIG_INTEL_TXT is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index 3ecb06919d6..9f043253787 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -97,7 +97,6 @@ CONFIG_I2C_I801=m # CONFIG_IBMEBUS is not set CONFIG_ICPLUS_PHY=m CONFIG_IDE=y -# CONFIG_IGB is not set # CONFIG_IIO is not set CONFIG_IOMMU_HELPER=y CONFIG_IPMI_HANDLER=m diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index feff9650fb8..5e4630ff5f0 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -110,7 +110,6 @@ CONFIG_I2C_I801=m CONFIG_IBMEBUS=y CONFIG_ICPLUS_PHY=m CONFIG_IDE=y -# CONFIG_IGB is not set # CONFIG_IIO is not set CONFIG_IOMMU_HELPER=y CONFIG_IPMI_HANDLER=m |