summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:11:53 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:11:53 +0200
commitdd11bb664ca533825bf9454714a9635268321882 (patch)
tree61ced71532f48c15abfc0364fc7617ad5e4dc3b2 /arch/i386/kernel
parent6000e8231e177c43dac15e09a310598031631b5c (diff)
i386: prepare shared kernel/vmiclock.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/i386/kernel')
-rw-r--r--arch/i386/kernel/Makefile2
-rw-r--r--arch/i386/kernel/vmiclock_32.c (renamed from arch/i386/kernel/vmiclock.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index d1375fa831e..dd172402a4a 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -41,7 +41,7 @@ obj-$(CONFIG_HPET_TIMER) += hpet.o
obj-$(CONFIG_K8_NB) += k8.o
obj-$(CONFIG_MGEODE_LX) += geode.o
-obj-$(CONFIG_VMI) += vmi.o vmiclock.o
+obj-$(CONFIG_VMI) += vmi.o vmiclock_32.o
obj-$(CONFIG_PARAVIRT) += paravirt.o
obj-y += pcspeaker.o
diff --git a/arch/i386/kernel/vmiclock.c b/arch/i386/kernel/vmiclock_32.c
index b1b5ab08b26..b1b5ab08b26 100644
--- a/arch/i386/kernel/vmiclock.c
+++ b/arch/i386/kernel/vmiclock_32.c