patch-2.3.41 linux/arch/i386/kernel/Makefile
Next file: linux/arch/i386/kernel/acpi.c
Previous file: linux/arch/i386/defconfig
Back to the patch index
Back to the overall index
- Lines: 28
- Date:
Thu Jan 27 08:58:15 2000
- Orig file:
v2.3.40/linux/arch/i386/kernel/Makefile
- Orig date:
Fri Jan 21 18:19:16 2000
diff -u --recursive --new-file v2.3.40/linux/arch/i386/kernel/Makefile linux/arch/i386/kernel/Makefile
@@ -14,7 +14,8 @@
O_TARGET := kernel.o
O_OBJS := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
- ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o
+ ptrace.o i8259.o ioport.o ldt.o setup.o time.o sys_i386.o \
+ pci-dma.o
OX_OBJS := i386_ksyms.o
MX_OBJS :=
@@ -39,8 +40,16 @@
endif
endif
+ifdef CONFIG_ACPI
+OX_OBJS += pm.o
+else
+ifdef CONFIG_APM
+OX_OBJS += pm.o
+endif
+endif
+
ifeq ($(CONFIG_ACPI),y)
- OX_OBJS += acpi.o
+ O_OBJS += acpi.o
endif
ifeq ($(CONFIG_APM),y)
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)