diff --git a/[refs] b/[refs]
index ed353be17b60..ce615f0ac77a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7a67e0e2db47cb8cfa2c550aaedf168b8275cce
+refs/heads/master: a9c0350568b93ba7204a56644031a2332c9517d1
diff --git a/trunk/arch/x86_64/kernel/acpi/Makefile b/trunk/arch/x86_64/kernel/acpi/Makefile
index 080b9963f1bc..fe34bbec1cf0 100644
--- a/trunk/arch/x86_64/kernel/acpi/Makefile
+++ b/trunk/arch/x86_64/kernel/acpi/Makefile
@@ -1,6 +1,6 @@
 obj-y			:= boot.o
 boot-y			:= ../../../i386/kernel/acpi/boot.o
-obj-$(CONFIG_ACPI_SLEEP)	+= sleep.o wakeup.o
+obj-$(CONFIG_ACPI_SLEEP)	+= sleep.o wakeup_64.o
 
 ifneq ($(CONFIG_ACPI_PROCESSOR),)
 obj-y			+= processor.o
diff --git a/trunk/arch/x86_64/kernel/acpi/wakeup.S b/trunk/arch/x86_64/kernel/acpi/wakeup_64.S
similarity index 100%
rename from trunk/arch/x86_64/kernel/acpi/wakeup.S
rename to trunk/arch/x86_64/kernel/acpi/wakeup_64.S