Message ID | 1350574745-22392-9-git-send-email-paolo.pisati@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 98db1a3..b331bbb 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -81,6 +81,7 @@ CONFIG_I2C_DESIGNWARE_CORE=m # CONFIG_IDE is not set CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 CONFIG_INTEL_TXT=y +CONFIG_INTERVAL_TREE_TEST=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y # CONFIG_IP_PNP is not set diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 7ec495f..fc75257 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -84,6 +84,7 @@ CONFIG_HZ=128 CONFIG_I2C_ALGOBIT=m CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_I2C_DESIGNWARE_PLATFORM=m +# CONFIG_INTERVAL_TREE_TEST is not set CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y # CONFIG_IP_PNP is not set diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index 016043e..db28aa8 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -47,6 +47,7 @@ CONFIG_GPIO_ADNP=m CONFIG_HZ=100 CONFIG_I2C_DESIGNWARE_CORE=y CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_INTERVAL_TREE_TEST=m # CONFIG_IPV6_PRIVACY is not set # CONFIG_IPV6_ROUTER_PREF is not set CONFIG_IP_PNP=y diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index 3726bd5..107b24e 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -47,6 +47,7 @@ CONFIG_HVC_DCC=y CONFIG_HZ=128 CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_I2C_DESIGNWARE_PLATFORM=m +# CONFIG_INTERVAL_TREE_TEST is not set CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y # CONFIG_IP_PNP is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index fb648b5..b56141d 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -2628,7 +2628,6 @@ CONFIG_INTEL_MID_PTI=m CONFIG_INTEL_OAKTRAIL=m CONFIG_INTEL_SCU_IPC=y CONFIG_INTEL_SCU_IPC_UTIL=m -CONFIG_INTERVAL_TREE_TEST=m CONFIG_IOMMU_API=y # CONFIG_IOMMU_DEBUG is not set CONFIG_IOMMU_HELPER=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index e986803..272565a 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -80,6 +80,7 @@ CONFIG_I2C_DESIGNWARE_CORE=m # CONFIG_IDE is not set CONFIG_ILLEGAL_POINTER_VALUE=0 # CONFIG_INTEL_TXT is not set +CONFIG_INTERVAL_TREE_TEST=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y # CONFIG_IP_PNP is not set diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index e7ab3a9..d074b8a 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -70,6 +70,7 @@ CONFIG_I2C_ALGOBIT=y CONFIG_I2C_DESIGNWARE_CORE=m # CONFIG_IBMEBUS is not set # CONFIG_IDE is not set +CONFIG_INTERVAL_TREE_TEST=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y # CONFIG_IP_PNP is not set diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index 48e2f6b..7fa1bb1 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -82,6 +82,7 @@ CONFIG_I2C_ALGOBIT=y CONFIG_I2C_DESIGNWARE_CORE=m CONFIG_IBMEBUS=y CONFIG_IDE=y +CONFIG_INTERVAL_TREE_TEST=m CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y # CONFIG_IP_PNP is not set
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> --- debian.master/config/amd64/config.common.amd64 | 1 + debian.master/config/armel/config.common.armel | 1 + debian.master/config/armhf/config.flavour.highbank | 1 + debian.master/config/armhf/config.flavour.omap | 1 + debian.master/config/config.common.ubuntu | 1 - debian.master/config/i386/config.common.i386 | 1 + debian.master/config/powerpc/config.common.powerpc | 1 + debian.master/config/ppc64/config.common.ppc64 | 1 + 8 files changed, 7 insertions(+), 1 deletion(-)