Merge commit 'v2.6.34-rc7' into perf/nmi

[mv-sheeva.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index a987aa1676b594b5501efd7213ccf671318c94c9..d5c30060ac1463531385eae8ddde3183f0724fca 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -77,6 +77,7 @@ obj-$(CONFIG_AUDIT_TREE) += audit_tree.o
 obj-$(CONFIG_KPROBES) += kprobes.o
 obj-$(CONFIG_KGDB) += kgdb.o
 obj-$(CONFIG_DETECT_SOFTLOCKUP) += softlockup.o
+obj-$(CONFIG_NMI_WATCHDOG) += nmi_watchdog.o
 obj-$(CONFIG_DETECT_HUNG_TASK) += hung_task.o
 obj-$(CONFIG_GENERIC_HARDIRQS) += irq/
 obj-$(CONFIG_SECCOMP) += seccomp.o