summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 09:12:49 (GMT)
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 09:12:49 (GMT)
commitf5a08b90f0089604be7a03c569ad8a44085bc363 (patch)
treeaeb21c61b908d07666c553c51d7aee8ea59c534a
parentee8b55e53c106e6325e1f8a36d7274da43546255 (diff)
downloadlinux-fsl-qoriq-f5a08b90f0089604be7a03c569ad8a44085bc363.tar.xz
i386: prepare shared kernel/time.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--arch/i386/kernel/Makefile2
-rw-r--r--arch/i386/kernel/time_32.c (renamed from arch/i386/kernel/time.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index e96419b..31c4541 100644
--- a/arch/i386/kernel/Makefile
+++ b/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/arch/i386/kernel/time.c b/arch/i386/kernel/time_32.c
index 19a6c67..19a6c67 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time_32.c