summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/Makefile
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-01-03 17:49:53 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-01-03 17:49:53 +0000
commiteb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (patch)
tree5746fea1605ff013be9b78a1556aaad7615d664a /arch/i386/kernel/Makefile
parent80ea5b1e15398277650e1197957053b5a71c08bc (diff)
Merge with Linux 2.1.131 plus some more MIPS goodies.
Diffstat (limited to 'arch/i386/kernel/Makefile')
-rw-r--r--arch/i386/kernel/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 917e7abdf..b8a94af18 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -34,6 +34,10 @@ else
endif
endif
+ifdef CONFIG_APM
+OX_OBJS += apm.o
+endif
+
ifdef SMP
O_OBJS += io_apic.o smp.o trampoline.o
endif