---

yaml --- r: 65507 b: refs/heads/master c: f11cfb4 h: refs/heads/master i: 65505: 30f9ef2 65503: 8861dba v: v3
git-mirror · Oct 11, 2007 · 1659c6a · 1659c6a
1 parent 6d0b98d
commit 1659c6a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08c81f47fcba935d937e45a592ad7b00e9296a2f
+refs/heads/master: f11cfb424c78ef8a6d9fc80922577756cec00282
diff --git a/trunk/arch/x86_64/kernel/acpi/Makefile b/trunk/arch/x86_64/kernel/acpi/Makefile
@@ -1,9 +1,5 @@
-obj-y			:= boot.o
-boot-y			:= ../../../i386/kernel/acpi/boot.o
-obj-$(CONFIG_ACPI_SLEEP)	+= sleep_64.o wakeup_64.o
-
-ifneq ($(CONFIG_ACPI_PROCESSOR),)
-obj-y			+= processor.o
-processor-y		:= ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o
+ifeq ($(CONFIG_X86_32),y)
+include ${srctree}/arch/i386/kernel/acpi/Makefile_32
+else
+include ${srctree}/arch/x86_64/kernel/acpi/Makefile_64
 endif
-
diff --git a/trunk/arch/x86_64/kernel/acpi/Makefile_64 b/trunk/arch/x86_64/kernel/acpi/Makefile_64
@@ -0,0 +1,9 @@
+obj-y			:= boot.o
+boot-y			:= ../../../i386/kernel/acpi/boot.o
+obj-$(CONFIG_ACPI_SLEEP)	+= sleep_64.o wakeup_64.o
+
+ifneq ($(CONFIG_ACPI_PROCESSOR),)
+obj-y			+= processor.o
+processor-y		:= ../../../i386/kernel/acpi/processor.o ../../../i386/kernel/acpi/cstate.o
+endif
+