Merge branch 'linux-2.6' into merge

[linux-2.6] / drivers / acpi / sleep / Makefile

diff --git a/drivers/acpi/sleep/Makefile b/drivers/acpi/sleep/Makefile
index 2bec897ab1eb6c3e9cfa139092f237242bb073a3..f1fb888c2d293752448d7124e8308740afc7d534 100644 (file)
--- a/drivers/acpi/sleep/Makefile
+++ b/drivers/acpi/sleep/Makefile
@@ -1,5 +1,5 @@
-obj-y                                  := poweroff.o wakeup.o
-obj-$(CONFIG_PM_SLEEP)                 += main.o
-obj-$(CONFIG_X86)                      += proc.o
+obj-y                                  := wakeup.o
+obj-y                                  += main.o
+obj-$(CONFIG_ACPI_SLEEP)               += proc.o
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)