aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:16:23 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:16:23 +0200
commit23d6f82bd1f07886b3a974c5193baa715475dd37 (patch)
tree71712aa315b370bd30fc38708c08ab45e29d3226 /arch/x86_64
parent9c2019421511a1bc646981d55528334ae46464c0 (diff)
i386: move kernel/acpi
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/acpi/Makefile2
-rw-r--r--arch/x86_64/kernel/acpi/Makefile_644
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile
index 6e00bfeb59a..dd4eb7cef2b 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 c24fe95b0d9..fc377c87e0b 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