diff --git a/[refs] b/[refs] index 9683c91ad7bc..1a4d7803048a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cde82b404831aecccf2a1828b2dc643e0ac0e7ce +refs/heads/master: b9fe30ac5cdfc4337a672a498a4ba4e8d5e18728 diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index f502c141c1df..b37e2d200430 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -42,7 +42,7 @@ obj-$(CONFIG_K8_NB) += k8.o obj-$(CONFIG_MGEODE_LX) += geode.o obj-$(CONFIG_VMI) += vmi_32.o vmiclock_32.o -obj-$(CONFIG_PARAVIRT) += paravirt.o +obj-$(CONFIG_PARAVIRT) += paravirt_32.o obj-y += pcspeaker.o obj-$(CONFIG_SCx200) += scx200.o diff --git a/trunk/arch/i386/kernel/paravirt.c b/trunk/arch/i386/kernel/paravirt_32.c similarity index 100% rename from trunk/arch/i386/kernel/paravirt.c rename to trunk/arch/i386/kernel/paravirt_32.c