diff --git a/[refs] b/[refs]
index dc03caa3d22b..995921ac061f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 193aa5d7efc827f1c4edc6ecaf3b4596e720f82f
+refs/heads/master: bf79503a14c2d7c8b27dec60dae60af69c509a77
diff --git a/trunk/arch/i386/kernel/acpi/Makefile b/trunk/arch/i386/kernel/acpi/Makefile
index fb602cd51924..cfbc7d8d66e2 100644
--- a/trunk/arch/i386/kernel/acpi/Makefile
+++ b/trunk/arch/i386/kernel/acpi/Makefile
@@ -2,7 +2,7 @@ obj-$(CONFIG_ACPI)		+= boot.o
 ifneq ($(CONFIG_PCI),)
 obj-$(CONFIG_X86_IO_APIC)	+= earlyquirk.o
 endif
-obj-$(CONFIG_ACPI_SLEEP)	+= sleep.o wakeup_32.o
+obj-$(CONFIG_ACPI_SLEEP)	+= sleep_32.o wakeup_32.o
 
 ifneq ($(CONFIG_ACPI_PROCESSOR),)
 obj-y				+= cstate.o processor.o
diff --git a/trunk/arch/i386/kernel/acpi/sleep.c b/trunk/arch/i386/kernel/acpi/sleep_32.c
similarity index 100%
rename from trunk/arch/i386/kernel/acpi/sleep.c
rename to trunk/arch/i386/kernel/acpi/sleep_32.c