patch-2.2.18 linux/arch/i386/kernel/Makefile

• Lines: 40
• Date: Tue Nov 21 15:37:05 2000
• Orig file: v2.2.17/arch/i386/kernel/Makefile
• Orig date: Sat Sep 9 18:42:32 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/arch/i386/kernel/Makefile linux/arch/i386/kernel/Makefile
@@ -15,7 +15,7 @@
 O_TARGET := kernel.o
 O_OBJS   := process.o signal.o entry.o traps.o irq.o vm86.o \
             ptrace.o ioport.o ldt.o setup.o time.o sys_i386.o \
-	    bluesmoke.o
+	    bluesmoke.o dmi_scan.o
 OX_OBJS  := i386_ksyms.o
 MX_OBJS  :=
 
@@ -32,6 +32,30 @@
 else
   ifeq ($(CONFIG_MTRR),m)
   MX_OBJS += mtrr.o
+  endif
+endif
+
+ifeq ($(CONFIG_MICROCODE),y)
+OX_OBJS += microcode.o
+else
+  ifeq ($(CONFIG_MICROCODE),m)
+  MX_OBJS += microcode.o
+  endif
+endif
+
+ifeq ($(CONFIG_X86_MSR),y)
+OX_OBJS += msr.o
+else
+  ifeq ($(CONFIG_X86_MSR),m)
+  MX_OBJS += msr.o
+  endif
+endif
+
+ifeq ($(CONFIG_X86_CPUID),y)
+OX_OBJS += cpuid.o
+else
+  ifeq ($(CONFIG_X86_CPUID),m)
+  MX_OBJS += cpuid.o
   endif
 endif