aboutsummaryrefslogtreecommitdiffstats
path: root/litmus/Kconfig
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2013-02-18 11:58:44 -0500
committerJonathan Herman <hermanjl@cs.unc.edu>2013-02-18 11:58:44 -0500
commit44f61e6c269e0a85b6cac608c6ee29d3dbbf21ad (patch)
treed816b63f2e22a62d21c09aeacc01e058c69852a8 /litmus/Kconfig
parent7806057274c493d53a214232d4df6f96aadc7547 (diff)
Clean this commitwip-mc
Diffstat (limited to 'litmus/Kconfig')
-rw-r--r--litmus/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/litmus/Kconfig b/litmus/Kconfig
index e71f7a332f2..1ba3a1368f6 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -39,7 +39,7 @@ config PLUGIN_PFAIR
39config MERGE_TIMERS 39config MERGE_TIMERS
40 bool "Timer-merging Support" 40 bool "Timer-merging Support"
41 depends on HIGH_RES_TIMERS 41 depends on HIGH_RES_TIMERS
42 default y 42 default n
43 help 43 help
44 Include support for merging timers. 44 Include support for merging timers.
45 45