Merge branch 'linus' into core/generic-dma-coherent

[sfrench/cifs-2.6.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index 985ddb7da4d02ccde3fa2acf1b4c9a5764778acb..e25ee775dc917bb97a88d2ef0a2f45ba1cfec6ee 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -81,6 +81,7 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o
 obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o
 obj-$(CONFIG_MARKERS) += marker.o
 obj-$(CONFIG_LATENCYTOP) += latencytop.o
+obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
 obj-$(CONFIG_FTRACE) += trace/
 obj-$(CONFIG_TRACING) += trace/
 obj-$(CONFIG_SMP) += sched_cpupri.o