diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:15:25 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:15:25 +0200 |
| commit | a9c0350568b93ba7204a56644031a2332c9517d1 (patch) | |
| tree | d93b3faac980dda79dda7412522ca13f151f96e2 | |
| parent | a7a67e0e2db47cb8cfa2c550aaedf168b8275cce (diff) | |
| download | linux-stable-a9c0350568b93ba7204a56644031a2332c9517d1.tar.gz linux-stable-a9c0350568b93ba7204a56644031a2332c9517d1.tar.bz2 linux-stable-a9c0350568b93ba7204a56644031a2332c9517d1.zip | |
x86_64: prepare shared kernel/acpi/wakeup.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86_64/kernel/acpi/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/acpi/wakeup_64.S (renamed from arch/x86_64/kernel/acpi/wakeup.S) | 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 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 index 8b4357e1efe0..8b4357e1efe0 100644 --- a/arch/x86_64/kernel/acpi/wakeup.S +++ b/arch/x86_64/kernel/acpi/wakeup_64.S |