Merge branches 'release', 'misc' and 'misc-2.6.25' into release

[karo-tx-linux.git] / arch / x86 / kernel / acpi / Makefile

diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile
index 3d5671939542a0f6a9c07256d4486ead7d6646a0..19d3d6e9d09b80f359a79de7525344b6d87401b5 100644 (file)
--- a/arch/x86/kernel/acpi/Makefile
+++ b/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.o wakeup_$(BITS).o
+
+ifneq ($(CONFIG_ACPI_PROCESSOR),)
+obj-y                          += cstate.o processor.o
 endif
+