patch-2.3.43 linux/arch/i386/kernel/Makefile

• Lines: 31
• Date: Thu Feb 10 12:35:19 2000
• Orig file: v2.3.42/linux/arch/i386/kernel/Makefile
• Orig date: Fri Jan 28 15:09:06 2000

diff -u --recursive --new-file v2.3.42/linux/arch/i386/kernel/Makefile linux/arch/i386/kernel/Makefile
@@ -40,23 +40,19 @@
   endif
 endif
 
-ifdef CONFIG_ACPI
-OX_OBJS += pm.o
-else
-ifdef CONFIG_APM
-OX_OBJS += pm.o
-endif
-endif
-
 ifeq ($(CONFIG_ACPI),y)
-  O_OBJS += acpi.o
+O_OBJS += acpi.o
+else
+  ifeq ($(CONFIG_ACPI),m)
+  M_OBJS += acpi.o
+  endif
 endif
 
 ifeq ($(CONFIG_APM),y)
-OX_OBJS += apm.o
+O_OBJS += apm.o
 else
   ifeq ($(CONFIG_APM),m)
-  MX_OBJS += apm.o
+  M_OBJS += apm.o
   endif
 endif