diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-08-24 12:43:42 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-11-16 14:26:54 -0700 |
| commit | d259ab927e05c278f26f33f38a98b15469921d5a (patch) | |
| tree | c0a7aec5b5226975ce48b03d940eb25cecf507c5 /debian.master/config | |
| parent | ffbe0708690a76b3393dc4aa0e469c0a4faa6a6e (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/config')
| -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 c80c7add8a5..c79df62e6d7 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -111,7 +111,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_MID_PTI=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index ed90c0c3b27..76aa803cad0 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -102,7 +102,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_INTEL_MID_PTI is not set # CONFIG_INTR_REMAP is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index e6b8bd4d403..47b4ff5dca7 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2167,6 +2167,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 c63c78e4e65..ecbc29cf087 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -110,7 +110,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_MID_PTI=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index d23cffda96b..ce3c3f0459c 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -98,7 +98,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_INTEL_MID_PTI=m CONFIG_IOMMU_HELPER=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 89eb9b85f94..370b0902de4 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -111,7 +111,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_INTEL_MID_PTI=m CONFIG_IOMMU_HELPER=y |