diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-07 15:45:24 +0000 |
| commit | 9f9f3e6e8548a596697778337110a423c384b6f3 (patch) | |
| tree | 5dd4b290ef532cf5ecb058e1a92cd3435afeac8c /kernel/Makefile | |
| parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) | |
Merge with Linux 2.3.49.
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index cce15a524..bec392fca 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -29,12 +29,8 @@ ifeq ($(CONFIG_MODULES),y) OX_OBJS += ksyms.o endif -ifdef CONFIG_ACPI +ifdef CONFIG_PM OX_OBJS += pm.o -else - ifdef CONFIG_APM - OX_OBJS += pm.o - endif endif CFLAGS_sched.o := $(PROFILING) -fno-omit-frame-pointer |