Merge commit 'v2.6.29-rc1' into perfcounters/core

[mv-sheeva.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index 2921d90ce32fd760000622032f6569b5ab413d71..8b2628c7914b039a90be2647b1b8926751d2dc7a 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -89,6 +89,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_PERF_COUNTERS) += perf_counter.o
 
 ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y)
 # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is