From b4d4cc7f9003e9bc4fcb706c262d7ed4cc1445e1 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:13:15 +0200 Subject: [PATCH] --- yaml --- r: 65409 b: refs/heads/master c: 193aa5d7efc827f1c4edc6ecaf3b4596e720f82f h: refs/heads/master i: 65407: eec7c4b4a1f272f69b48ffaf73d7d2b449164fe2 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/acpi/Makefile | 2 +- trunk/arch/i386/kernel/acpi/{wakeup.S => wakeup_32.S} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/acpi/{wakeup.S => wakeup_32.S} (100%) diff --git a/[refs] b/[refs] index 8e9c9e847b66..dc03caa3d22b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1589cd4cba22e374b54f49385703fc766a11e7f +refs/heads/master: 193aa5d7efc827f1c4edc6ecaf3b4596e720f82f diff --git a/trunk/arch/i386/kernel/acpi/Makefile b/trunk/arch/i386/kernel/acpi/Makefile index 7f7be01f44e6..fb602cd51924 100644 --- a/trunk/arch/i386/kernel/acpi/Makefile +++ b/trunk/arch/i386/kernel/acpi/Makefile @@ -2,7 +2,7 @@ obj-$(CONFIG_ACPI) += boot.o ifneq ($(CONFIG_PCI),) obj-$(CONFIG_X86_IO_APIC) += earlyquirk.o endif -obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup.o +obj-$(CONFIG_ACPI_SLEEP) += sleep.o wakeup_32.o ifneq ($(CONFIG_ACPI_PROCESSOR),) obj-y += cstate.o processor.o diff --git a/trunk/arch/i386/kernel/acpi/wakeup.S b/trunk/arch/i386/kernel/acpi/wakeup_32.S similarity index 100% rename from trunk/arch/i386/kernel/acpi/wakeup.S rename to trunk/arch/i386/kernel/acpi/wakeup_32.S