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 /arch/i386/kernel/Makefile | |
parent | d5c9a365ee7d2fded249aa5abfc5e89587583029 (diff) |
Merge with Linux 2.3.49.
Diffstat (limited to 'arch/i386/kernel/Makefile')
-rw-r--r-- | arch/i386/kernel/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile index 3b7bb1258..6671bb35b 100644 --- a/arch/i386/kernel/Makefile +++ b/arch/i386/kernel/Makefile @@ -40,7 +40,6 @@ else endif endif -ifeq ($(CONFIG_PROC_FS),y) ifeq ($(CONFIG_MICROCODE),y) OX_OBJS += microcode.o else @@ -48,7 +47,6 @@ else MX_OBJS += microcode.o endif endif -endif ifeq ($(CONFIG_ACPI),y) O_OBJS += acpi.o |