From: Thomas Gleixner Date: Thu, 11 Oct 2007 09:15:25 +0000 (+0200) Subject: x86_64: prepare shared kernel/acpi/wakeup.S X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a9c0350568b93ba7204a56644031a2332c9517d1;p=linux-beck.git x86_64: prepare shared kernel/acpi/wakeup.S Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile index 080b9963f1bc..fe34bbec1cf0 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.o +obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup_64.o ifneq ($(CONFIG_ACPI_PROCESSOR),) obj-y += processor.o diff --git a/arch/x86_64/kernel/acpi/wakeup.S b/arch/x86_64/kernel/acpi/wakeup_64.S similarity index 100% rename from arch/x86_64/kernel/acpi/wakeup.S rename to arch/x86_64/kernel/acpi/wakeup_64.S