diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:05:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-26 19:05:01 -0400 |
commit | 831576fe40f4175e0767623cffa4aeb28157943a (patch) | |
tree | de54e628e5849d6cf201df4446d760d17f752326 /lib/Kconfig | |
parent | 21cdbc1378e8aa96e1ed4a606dce1a8e7daf7fdf (diff) | |
parent | 66fef08f7d5267b2312c4b48a6d2957d2d414105 (diff) |
Merge branch 'sched-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (46 commits)
sched: Add comments to find_busiest_group() function
sched: Refactor the power savings balance code
sched: Optimize the !power_savings_balance during fbg()
sched: Create a helper function to calculate imbalance
sched: Create helper to calculate small_imbalance in fbg()
sched: Create a helper function to calculate sched_domain stats for fbg()
sched: Define structure to store the sched_domain statistics for fbg()
sched: Create a helper function to calculate sched_group stats for fbg()
sched: Define structure to store the sched_group statistics for fbg()
sched: Fix indentations in find_busiest_group() using gotos
sched: Simple helper functions for find_busiest_group()
sched: remove unused fields from struct rq
sched: jiffies not printed per CPU
sched: small optimisation of can_migrate_task()
sched: fix typos in documentation
sched: add avg_overlap decay
x86, sched_clock(): mark variables read-mostly
sched: optimize ttwu vs group scheduling
sched: TIF_NEED_RESCHED -> need_reshed() cleanup
sched: don't rebalance if attached on NULL domain
...
Diffstat (limited to 'lib/Kconfig')
-rw-r--r-- | lib/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/Kconfig b/lib/Kconfig index cea9e30a88ff..54aaf4feaf6c 100644 --- a/lib/Kconfig +++ b/lib/Kconfig | |||
@@ -136,12 +136,6 @@ config TEXTSEARCH_BM | |||
136 | config TEXTSEARCH_FSM | 136 | config TEXTSEARCH_FSM |
137 | tristate | 137 | tristate |
138 | 138 | ||
139 | # | ||
140 | # plist support is select#ed if needed | ||
141 | # | ||
142 | config PLIST | ||
143 | boolean | ||
144 | |||
145 | config HAS_IOMEM | 139 | config HAS_IOMEM |
146 | boolean | 140 | boolean |
147 | depends on !NO_IOMEM | 141 | depends on !NO_IOMEM |