projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into perfcounters/core-v2
[linux-2.6-block.git]
/
kernel
/
Makefile
diff --git
a/kernel/Makefile
b/kernel/Makefile
index 9ef39e5b02110cf2d5a3635a92bac13879b37665..63c697529ca154d80426563e042b8dd28935ae93 100644
(file)
--- a/
kernel/Makefile
+++ b/
kernel/Makefile
@@
-93,6
+93,7
@@
obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
obj-$(CONFIG_FUNCTION_TRACER) += trace/
obj-$(CONFIG_TRACING) += trace/
obj-$(CONFIG_SMP) += sched_cpupri.o
+obj-$(CONFIG_SLOW_WORK) += slow-work.o
obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o
ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)