From 6d0b98dee367e39005058c6ebb7b78cb1c7fd253 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:15:27 +0200 Subject: [PATCH] --- yaml --- r: 65506 b: refs/heads/master c: 08c81f47fcba935d937e45a592ad7b00e9296a2f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/acpi/Makefile | 2 +- trunk/arch/x86_64/kernel/acpi/{sleep.c => sleep_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/acpi/{sleep.c => sleep_64.c} (100%) diff --git a/[refs] b/[refs] index ce615f0ac77a..335619a43695 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9c0350568b93ba7204a56644031a2332c9517d1 +refs/heads/master: 08c81f47fcba935d937e45a592ad7b00e9296a2f diff --git a/trunk/arch/x86_64/kernel/acpi/Makefile b/trunk/arch/x86_64/kernel/acpi/Makefile index fe34bbec1cf0..c24fe95b0d94 100644 --- a/trunk/arch/x86_64/kernel/acpi/Makefile +++ b/trunk/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/trunk/arch/x86_64/kernel/acpi/sleep.c b/trunk/arch/x86_64/kernel/acpi/sleep_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/acpi/sleep.c rename to trunk/arch/x86_64/kernel/acpi/sleep_64.c