diff --git a/[refs] b/[refs] index 455b4830e192..fa06832d7979 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c3ca5f30b607298c6c33bfc5318de1cf542c50ef +refs/heads/master: 0856268597a2ce7efc30390695d655d3dee05ca8 diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index 5ddd94b34b2c..8c48cd7b399c 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/arch/x86_64/kernel/Makefile @@ -38,7 +38,7 @@ obj-$(CONFIG_X86_VSMP) += vsmp.o obj-$(CONFIG_K8_NB) += k8.o obj-$(CONFIG_AUDIT) += audit.o -obj-$(CONFIG_MODULES) += module.o +obj-$(CONFIG_MODULES) += module_64.o obj-$(CONFIG_PCI) += early-quirks.o obj-y += topology.o diff --git a/trunk/arch/x86_64/kernel/module.c b/trunk/arch/x86_64/kernel/module_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/module.c rename to trunk/arch/x86_64/kernel/module_64.c