lockup_detector: Combine nmi_watchdog and softlockup detector

[karo-tx-linux.git] / arch / x86 / kernel / apic / Makefile

diff --git a/arch/x86/kernel/apic/Makefile b/arch/x86/kernel/apic/Makefile
index 1a4512e48d24ef42c2ac8d0de0919212ef517eae..52f32e0ea19485db191544b87797d4115e4daa27 100644 (file)
--- a/arch/x86/kernel/apic/Makefile
+++ b/arch/x86/kernel/apic/Makefile
@@ -3,10 +3,10 @@
 #
 
 obj-$(CONFIG_X86_LOCAL_APIC)   += apic.o apic_noop.o probe_$(BITS).o ipi.o
-ifneq ($(CONFIG_NMI_WATCHDOG),y)
+ifneq ($(CONFIG_LOCKUP_DETECTOR),y)
 obj-$(CONFIG_X86_LOCAL_APIC)   += nmi.o
 endif
-obj-$(CONFIG_NMI_WATCHDOG)     += hw_nmi.o
+obj-$(CONFIG_LOCKUP_DETECTOR)  += hw_nmi.o
 
 obj-$(CONFIG_X86_IO_APIC)      += io_apic.o
 obj-$(CONFIG_SMP)              += ipi.o