LINARO: enable CONFIG_TIMER_STATS

Signed-off-by: John Rigby <john.rigby@linaro.org>

8 files changed, 7 insertions, 7 deletions

diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index 2f139e4a8e36..940443c61828 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -28,9 +28,10 @@ linux-linaro (2.6.38-1001.2) UNRELEASED; urgency=low
   * Remove generated file kernel-versions and sort kerne-versions.in
   * panda twl6030 enable all irq sources
     - LP: #708883
+  * Enable CONFIG_TIMER_STATS
+    - LP: #718677
 
-
- -- John Rigby <john.rigby@linaro.org>  Thu, 10 Mar 2011 11:32:20 -0700
+ -- John Rigby <john.rigby@linaro.org>  Thu, 10 Mar 2011 14:41:46 -0700
 
 linux-linaro (2.6.38-1000.1) natty; urgency=low
 
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index ca79d7187e6b..a1ddb81490cd 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -450,7 +450,6 @@ CONFIG_STE10XP=y
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_THERMAL is not set
 # CONFIG_THUMB2_KERNEL is not set
-# CONFIG_TIMER_STATS is not set
 # CONFIG_TIPC is not set
 CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 3d39df2f1bab..fe28afc06482 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -510,7 +510,6 @@ CONFIG_TCP_CONG_ADVANCED=y
 CONFIG_TCP_MD5SIG=y
 CONFIG_THERMAL=m
 CONFIG_THUMB2_KERNEL=y
-CONFIG_TIMER_STATS=y
 CONFIG_TIPC=m
 CONFIG_TOUCHSCREEN_88PM860X=m
 CONFIG_TOUCHSCREEN_AD7877=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index be3fc3ef27b1..8e61386e5471 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -476,7 +476,6 @@ CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_THERMAL is not set
 # CONFIG_THUMB2_KERNEL is not set
-# CONFIG_TIMER_STATS is not set
 # CONFIG_TIPC is not set
 # CONFIG_TOUCHSCREEN_88PM860X is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index 3c4ac2ac2bdf..f96de80f3526 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -492,7 +492,6 @@ CONFIG_STE10XP=y
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_THERMAL is not set
 # CONFIG_THUMB2_KERNEL is not set
-# CONFIG_TIMER_STATS is not set
 # CONFIG_TIPC is not set
 # CONFIG_TOUCHSCREEN_88PM860X is not set
 # CONFIG_TOUCHSCREEN_AD7877 is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 230386f199e7..c6dc446e8a8e 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -467,7 +467,6 @@ CONFIG_SWP_EMULATE=y
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_THERMAL is not set
 # CONFIG_THUMB2_KERNEL is not set
-# CONFIG_TIMER_STATS is not set
 # CONFIG_TIPC is not set
 # CONFIG_TUN is not set
 # CONFIG_UDF_FS is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 5b28a4875392..557a284dd3df 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -2605,6 +2605,7 @@ CONFIG_TICK_ONESHOT=y
 # CONFIG_TIDSPBRIDGE is not set
 CONFIG_TIMB_DMA=m
 CONFIG_TIMERFD=y
+CONFIG_TIMER_STATS=y
 CONFIG_TINY_RCU=y
 # CONFIG_TIPC_ADVANCED is not set
 # CONFIG_TIPC_DEBUG is not set
diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce
index c88f65da1752..7edafbe533bf 100644
--- a/debian.linaro/config/enforce
+++ b/debian.linaro/config/enforce
@@ -83,3 +83,6 @@ value CONFIG_ARCH_S5PV310 y | value CONFIG_PM_ADVANCED_DEBUG y
 # LINARO kernels should be able to boot with a BTRFS rootfs without an initrd
 value CONFIG_BTRFS_FS y
 value CONFIG_LIBCRC32C y
+
+# LINARO kernels should have TIMER_STATS on (LP: 718677)
+value CONFIG_TIMER_STATS y