summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner2007-10-11 11:15:27 +0200
committerThomas Gleixner2007-10-11 11:15:27 +0200
commit08c81f47fcba935d937e45a592ad7b00e9296a2f (patch)
tree7ab24aca81446ea8cf0af30eafd3e87b8995ed33 /arch
parentx86_64: prepare shared kernel/acpi/wakeup.S (diff)
downloadkernel-qcow2-linux-08c81f47fcba935d937e45a592ad7b00e9296a2f.tar.gz
kernel-qcow2-linux-08c81f47fcba935d937e45a592ad7b00e9296a2f.tar.xz
kernel-qcow2-linux-08c81f47fcba935d937e45a592ad7b00e9296a2f.zip
x86_64: prepare shared kernel/acpi/sleep.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/acpi/Makefile2
-rw-r--r--arch/x86_64/kernel/acpi/sleep_64.c (renamed from arch/x86_64/kernel/acpi/sleep.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile
index fe34bbec1cf0..c24fe95b0d94 100644
--- a/arch/x86_64/kernel/acpi/Makefile
+++ b/arch/x86_64/kernel/acpi/Makefile
@@ -1,6 +1,6 @@
obj-y := boot.o
boot-y := ../../../i386/kernel/acpi/boot.o
-obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup_64.o
+obj-$(CONFIG_ACPI_SLEEP) += sleep_64.o wakeup_64.o
ifneq ($(CONFIG_ACPI_PROCESSOR),)
obj-y += processor.o
diff --git a/arch/x86_64/kernel/acpi/sleep.c b/arch/x86_64/kernel/acpi/sleep_64.c
index 79475d237071..79475d237071 100644
--- a/arch/x86_64/kernel/acpi/sleep.c
+++ b/arch/x86_64/kernel/acpi/sleep_64.c