---

yaml --- r: 99679 b: refs/heads/master c: b79cd8f h: refs/heads/master i: 99677: 0ba2612 99675: 744e490 99671: 5620355 99663: 5494649 99647: 6924be0 v: v3
git-mirror · May 25, 2008 · d38995f · d38995f
1 parent a8e3304
commit d38995f
Show file tree

Hide file tree

Showing 9 changed files with 497 additions and 877 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 833e78bfeeef628f0201349a0a05a54f48f07884
+refs/heads/master: b79cd8f1268bab57ff85b19d131f7f23deab2dee
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
@@ -22,7 +22,7 @@ obj-y			+= setup_$(BITS).o i8259_$(BITS).o setup.o
 obj-$(CONFIG_X86_32)	+= sys_i386_32.o i386_ksyms_32.o
 obj-$(CONFIG_X86_64)	+= sys_x86_64.o x8664_ksyms_64.o
 obj-$(CONFIG_X86_64)	+= syscall_64.o vsyscall_64.o setup64.o
-obj-y			+= bootflag.o e820_$(BITS).o
+obj-y			+= bootflag.o e820_$(BITS).o e820.o
 obj-y			+= pci-dma.o quirks.o i8237.o topology.o kdebugfs.o
 obj-y			+= alternative.o i8253.o pci-nommu.o
 obj-$(CONFIG_X86_64)	+= bugs_64.o