From 047a6099750194909a5d41b0aaf9c8bb8332e638 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:12:49 +0200 Subject: [PATCH] --- yaml --- r: 65390 b: refs/heads/master c: f5a08b90f0089604be7a03c569ad8a44085bc363 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{time.c => time_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{time.c => time_32.c} (100%) diff --git a/[refs] b/[refs] index a90efdd9904b..46ff4c5d2ac9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee8b55e53c106e6325e1f8a36d7274da43546255 +refs/heads/master: f5a08b90f0089604be7a03c569ad8a44085bc363 diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index e96419b6821d..31c4541c4e14 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -5,7 +5,7 @@ extra-y := head.o init_task.o vmlinux.lds obj-y := process.o signal_32.o entry.o traps_32.o irq.o \ - ptrace.o time.o ioport_32.o ldt.o setup_32.o i8259_32.o sys_i386_32.o \ + ptrace.o time_32.o ioport_32.o ldt.o setup_32.o i8259_32.o sys_i386_32.o \ pci-dma_32.o i386_ksyms_32.o i387_32.o bootflag.o e820_32.o\ quirks.o i8237.o topology.o alternative.o i8253_32.o tsc.o diff --git a/trunk/arch/i386/kernel/time.c b/trunk/arch/i386/kernel/time_32.c similarity index 100% rename from trunk/arch/i386/kernel/time.c rename to trunk/arch/i386/kernel/time_32.c