diff --git a/[refs] b/[refs]
index 335619a43695..add784598d0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08c81f47fcba935d937e45a592ad7b00e9296a2f
+refs/heads/master: f11cfb424c78ef8a6d9fc80922577756cec00282
diff --git a/trunk/arch/x86_64/kernel/acpi/Makefile b/trunk/arch/x86_64/kernel/acpi/Makefile
index c24fe95b0d94..6e00bfeb59a9 100644
--- a/trunk/arch/x86_64/kernel/acpi/Makefile
+++ b/trunk/arch/x86_64/kernel/acpi/Makefile
@@ -1,9 +1,5 @@
-obj-y			:= boot.o
-boot-y			:= ../../../i386/kernel/acpi/boot.o
-obj-$(CONFIG_ACPI_SLEEP)	+= sleep_64.o wakeup_64.o
-
-ifneq ($(CONFIG_ACPI_PROCESSOR),)
-obj-y			+= processor.o
-processor-y		:= ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/i386/kernel/acpi/Makefile_32
+else
+include ${srctree}/arch/x86_64/kernel/acpi/Makefile_64
 endif
-
diff --git a/trunk/arch/x86_64/kernel/acpi/Makefile_64 b/trunk/arch/x86_64/kernel/acpi/Makefile_64
new file mode 100644
index 000000000000..c24fe95b0d94
--- /dev/null
+++ b/trunk/arch/x86_64/kernel/acpi/Makefile_64
@@ -0,0 +1,9 @@
+obj-y			:= boot.o
+boot-y			:= ../../../i386/kernel/acpi/boot.o
+obj-$(CONFIG_ACPI_SLEEP)	+= sleep_64.o wakeup_64.o
+
+ifneq ($(CONFIG_ACPI_PROCESSOR),)
+obj-y			+= processor.o
+processor-y		:= ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o
+endif
+