---

yaml --- r: 72364 b: refs/heads/master c: 5e4181b h: refs/heads/master v: v3
git-mirror · Oct 23, 2007 · 657631e · 657631e
1 parent 02e5d4f
commit 657631e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b58aebc73095c045826d891f8e8de6d5bd48c12
+refs/heads/master: 5e4181b31366ea13b7b81ce3b0041f5710cc8b65
diff --git a/trunk/arch/x86/kernel/acpi/Makefile b/trunk/arch/x86/kernel/acpi/Makefile
@@ -1,5 +1,7 @@
-ifeq ($(CONFIG_X86_32),y)
-include ${srctree}/arch/x86/kernel/acpi/Makefile_32
-else
-include ${srctree}/arch/x86/kernel/acpi/Makefile_64
+obj-$(CONFIG_ACPI)		+= boot.o
+obj-$(CONFIG_ACPI_SLEEP)	+= sleep_$(BITS).o wakeup_$(BITS).o
+
+ifneq ($(CONFIG_ACPI_PROCESSOR),)
+obj-y				+= cstate.o processor.o
 endif
+
diff --git a/trunk/arch/x86/kernel/acpi/Makefile_32 b/trunk/arch/x86/kernel/acpi/Makefile_32
diff --git a/trunk/arch/x86/kernel/acpi/Makefile_64 b/trunk/arch/x86/kernel/acpi/Makefile_64