2 files changed, 14 insertions, 9 deletions

diff --git a/arch/i386/kernel/acpi/Makefile b/arch/i386/kernel/acpi/Makefile
index a4852a2e9190..6e00bfeb59a9 100644
--- a/arch/i386/kernel/acpi/Makefile
+++ b/arch/i386/kernel/acpi/Makefile
@@ -1,10 +1,5 @@
-obj-$(CONFIG_ACPI)              += boot.o
-ifneq ($(CONFIG_PCI),)
-obj-$(CONFIG_X86_IO_APIC)       += earlyquirk_32.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
-obj-$(CONFIG_ACPI_SLEEP)        += sleep_32.o wakeup_32.o
-
-ifneq ($(CONFIG_ACPI_PROCESSOR),)
-obj-y                           += cstate.o processor.o
-endif
-
diff --git a/arch/i386/kernel/acpi/Makefile_32 b/arch/i386/kernel/acpi/Makefile_32
new file mode 100644
index 000000000000..a4852a2e9190
--- /dev/null
+++ b/arch/i386/kernel/acpi/Makefile_32
@@ -0,0 +1,10 @@
+obj-$(CONFIG_ACPI)              += boot.o
+ifneq ($(CONFIG_PCI),)
+obj-$(CONFIG_X86_IO_APIC)       += earlyquirk_32.o
+endif
+obj-$(CONFIG_ACPI_SLEEP)        += sleep_32.o wakeup_32.o
+
+ifneq ($(CONFIG_ACPI_PROCESSOR),)
+obj-y                           += cstate.o processor.o
+endif
+