diff options
Diffstat (limited to 'arch/i386/kernel/Makefile')
| -rw-r--r-- | arch/i386/kernel/Makefile | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 6b7302f99..96be4dff6 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -40,23 +40,19 @@ else 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 |