Message ID | 1350574745-22392-8-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 e9f937d..98db1a3 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -174,6 +174,7 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_RADIO_SHARK=m CONFIG_RADIO_SHARK2=m +CONFIG_RBTREE_TEST=m CONFIG_RCU_FANOUT=64 # CONFIG_REGULATOR_DEBUG is not set CONFIG_REGULATOR_FIXED_VOLTAGE=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 3d0af2c..7ec495f 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -180,6 +180,7 @@ CONFIG_PSTORE=y CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_RADIO_SHARK is not set # CONFIG_RADIO_SHARK2 is not set +# CONFIG_RBTREE_TEST is not set CONFIG_RCU_FANOUT=32 # CONFIG_REGULATOR_DEBUG is not set CONFIG_REGULATOR_FIXED_VOLTAGE=y diff --git a/debian.master/config/armhf/config.flavour.highbank b/debian.master/config/armhf/config.flavour.highbank index fcf59e7..016043e 100644 --- a/debian.master/config/armhf/config.flavour.highbank +++ b/debian.master/config/armhf/config.flavour.highbank @@ -120,6 +120,7 @@ CONFIG_PREEMPT_RCU=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PSTORE is not set # CONFIG_QUOTA_NETLINK_INTERFACE is not set +CONFIG_RBTREE_TEST=m CONFIG_RTC_DRV_TWL4030=m CONFIG_SATA_AHCI_PLATFORM=y # CONFIG_SCHED_AUTOGROUP is not set diff --git a/debian.master/config/armhf/config.flavour.omap b/debian.master/config/armhf/config.flavour.omap index fac01d8..3726bd5 100644 --- a/debian.master/config/armhf/config.flavour.omap +++ b/debian.master/config/armhf/config.flavour.omap @@ -120,6 +120,7 @@ CONFIG_PPP_MULTILINK=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PSTORE=y CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_RBTREE_TEST is not set CONFIG_RTC_DRV_TWL4030=y CONFIG_SATA_AHCI_PLATFORM=m CONFIG_SCHED_AUTOGROUP=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 8f505d6..fb648b5 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -4539,7 +4539,6 @@ CONFIG_RAPIDIO_TSI568=y CONFIG_RAPIDIO_TSI57X=y CONFIG_RAPIDIO_TSI721=y CONFIG_RAW_DRIVER=m -CONFIG_RBTREE_TEST=m # CONFIG_RCU_BOOST is not set # CONFIG_RCU_CPU_STALL_INFO is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 8937caa..e986803 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -173,6 +173,7 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_RADIO_SHARK=m CONFIG_RADIO_SHARK2=m +CONFIG_RBTREE_TEST=m CONFIG_RCU_FANOUT=32 CONFIG_REGULATOR_DEBUG=y CONFIG_REGULATOR_FIXED_VOLTAGE=m diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc index ebd0ef8..e7ab3a9 100644 --- a/debian.master/config/powerpc/config.common.powerpc +++ b/debian.master/config/powerpc/config.common.powerpc @@ -167,6 +167,7 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_RADIO_SHARK=m CONFIG_RADIO_SHARK2=m +CONFIG_RBTREE_TEST=m # CONFIG_REGULATOR_DEBUG is not set CONFIG_REGULATOR_FIXED_VOLTAGE=m CONFIG_RT2800USB_UNKNOWN=y diff --git a/debian.master/config/ppc64/config.common.ppc64 b/debian.master/config/ppc64/config.common.ppc64 index f6dd1d6..48e2f6b 100644 --- a/debian.master/config/ppc64/config.common.ppc64 +++ b/debian.master/config/ppc64/config.common.ppc64 @@ -200,6 +200,7 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_QUOTA_NETLINK_INTERFACE=y CONFIG_RADIO_SHARK=m CONFIG_RADIO_SHARK2=m +CONFIG_RBTREE_TEST=m CONFIG_RCU_FANOUT=64 # CONFIG_REGULATOR_DEBUG is not set CONFIG_REGULATOR_FIXED_VOLTAGE=m
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(-)