patch-2.4.0-test3 linux/arch/i386/kernel/Makefile

• Lines: 18
• Date: Wed Jul 5 11:23:12 2000
• Orig file: v2.4.0-test2/linux/arch/i386/kernel/Makefile
• Orig date: Fri Jun 23 21:55:07 2000

diff -u --recursive --new-file v2.4.0-test2/linux/arch/i386/kernel/Makefile linux/arch/i386/kernel/Makefile
@@ -35,12 +35,16 @@
 obj-$(CONFIG_X86_MSR)	+= msr.o
 obj-$(CONFIG_X86_CPUID)	+= cpuid.o
 obj-$(CONFIG_MICROCODE)	+= microcode.o
-obj-$(CONFIG_ACPI)	+= acpi.o
 obj-$(CONFIG_APM)	+= apm.o
 obj-$(CONFIG_SMP)	+= smp.o smpboot.o trampoline.o
 obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o
 obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o mpparse.o
 obj-$(CONFIG_X86_VISWS_APIC)	+= visws_apic.o
+
+# if the interpreter is used, it overrides acpi.c
+ifneq ($(CONFIG_ACPI_INTERPRETER),y)
+obj-$(CONFIG_ACPI)	+= acpi.o
+endif
 
 O_OBJS		:= $(filter-out	$(export-objs), $(obj-y))
 OX_OBJS		:= $(filter	$(export-objs), $(obj-y))