---

yaml --- r: 163728 b: refs/heads/master c: 4792621 h: refs/heads/master v: v3
git-mirror · Aug 31, 2009 · b83afc0 · b83afc0
1 parent a2d7d57
commit b83afc0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 123 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef4512882dbe9978e7a18ccbcb4cb45705ce5560
+refs/heads/master: 47926214d8b2bef13b2be57c500194a804f16198
diff --git a/trunk/arch/x86/kernel/Makefile b/trunk/arch/x86/kernel/Makefile
@@ -31,7 +31,7 @@ GCOV_PROFILE_paravirt.o		:= n
 
 obj-y			:= process_$(BITS).o signal.o entry_$(BITS).o
 obj-y			+= traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o
-obj-y			+= time_$(BITS).o ioport.o ldt.o dumpstack.o
+obj-y			+= time.o ioport.o ldt.o dumpstack.o
 obj-y			+= setup.o x86_init.o i8259.o irqinit.o
 obj-$(CONFIG_X86_VISWS)	+= visws_quirks.o
 obj-$(CONFIG_X86_32)	+= probe_roms_32.o

diff --git a/trunk/arch/x86/kernel/time_32.c → trunk/arch/x86/kernel/time.c b/trunk/arch/x86/kernel/time_32.c → trunk/arch/x86/kernel/time.c
diff --git a/trunk/arch/x86/kernel/time_64.c b/trunk/arch/x86/kernel/time_64.c