From b4b33637545aca471f753373fae14f773e1f7f7a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:11:53 +0200 Subject: [PATCH] --- yaml --- r: 65350 b: refs/heads/master c: dd11bb664ca533825bf9454714a9635268321882 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{vmiclock.c => vmiclock_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{vmiclock.c => vmiclock_32.c} (100%) diff --git a/[refs] b/[refs] index 42ab5bbcae69..facec70717cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6000e8231e177c43dac15e09a310598031631b5c +refs/heads/master: dd11bb664ca533825bf9454714a9635268321882 diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index d1375fa831e6..dd172402a4a0 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/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/trunk/arch/i386/kernel/vmiclock.c b/trunk/arch/i386/kernel/vmiclock_32.c similarity index 100% rename from trunk/arch/i386/kernel/vmiclock.c rename to trunk/arch/i386/kernel/vmiclock_32.c