diff --git a/[refs] b/[refs] index 45ace0df3ef4..9de935400516 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abb11834c6515161babea211a7be1fc6dcb893dc +refs/heads/master: e877d83a8e2643a026559a60ac6d1ee9fb827677 diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/arch/x86_64/kernel/Makefile index 1c9ae60f0bf5..edd3ad7995d6 100644 --- a/trunk/arch/x86_64/kernel/Makefile +++ b/trunk/arch/x86_64/kernel/Makefile @@ -36,7 +36,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_X86_PM_TIMER) += pmtimer_64.o obj-$(CONFIG_X86_VSMP) += vsmp_64.o obj-$(CONFIG_K8_NB) += k8.o -obj-$(CONFIG_AUDIT) += audit.o +obj-$(CONFIG_AUDIT) += audit_64.o obj-$(CONFIG_MODULES) += module_64.o obj-$(CONFIG_PCI) += early-quirks_64.o diff --git a/trunk/arch/x86_64/kernel/audit.c b/trunk/arch/x86_64/kernel/audit_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/audit.c rename to trunk/arch/x86_64/kernel/audit_64.c