i386: move kernel/acpi

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile
index 6e00bfeb59a9..dd4eb7cef2b4 100644
--- a/arch/x86_64/kernel/acpi/Makefile
+++ b/arch/x86_64/kernel/acpi/Makefile
@@ -1,5 +1,5 @@
 ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/i386/kernel/acpi/Makefile_32
+include ${srctree}/arch/x86/kernel/acpi/Makefile_32
 else
 include ${srctree}/arch/x86_64/kernel/acpi/Makefile_64
 endif
diff --git a/arch/x86_64/kernel/acpi/Makefile_64 b/arch/x86_64/kernel/acpi/Makefile_64
index c24fe95b0d94..fc377c87e0b0 100644
--- a/arch/x86_64/kernel/acpi/Makefile_64
+++ b/arch/x86_64/kernel/acpi/Makefile_64
@@ -1,9 +1,9 @@
 obj-y                   := boot.o
-boot-y                  := ../../../i386/kernel/acpi/boot.o
+boot-y                  := ../../../x86/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
+processor-y             := ../../../x86/kernel/acpi/processor.o ../../../x86/kernel/acpi/cstate.o
 endif