i386: move kernel/acpi

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

arch/i386/kernel/Makefile_32

@@ -11,7 +11,7 @@ obj-y	:= process_32.o signal_32.o entry_32.o traps_32.o irq_32.o \
 
 obj-$(CONFIG_STACKTRACE)	+= stacktrace.o
 obj-y				+= cpu/
-obj-y				+= acpi/
+obj-y				+= ../../x86/kernel/acpi/
 obj-$(CONFIG_X86_BIOS_REBOOT)	+= reboot_32.o
 obj-$(CONFIG_MCA)		+= mca_32.o
 obj-$(CONFIG_X86_MSR)		+= msr.o

arch/i386/kernel/acpi/Makefile → arch/x86/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

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

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