---

yaml --- r: 65409 b: refs/heads/master c: 193aa5d h: refs/heads/master i: 65407: eec7c4b v: v3
git-mirror · Oct 11, 2007 · b4d4cc7 · b4d4cc7
1 parent 0c158a1
commit b4d4cc7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 → trunk/arch/i386/kernel/acpi/wakeup_32.S b/trunk/arch/i386/kernel/acpi/wakeup.S → trunk/arch/i386/kernel/acpi/wakeup_32.S