aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/sleep/Makefile
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-07-28 03:33:16 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-29 16:53:59 -0700
commit673d5b43daa00b42759cecc6b0760b8bf6be80d2 (patch)
treea795ee922db699a8b4cb893ef5809399f1591ba6 /drivers/acpi/sleep/Makefile
parent296699de6bdc717189a331ab6bbe90e05c94db06 (diff)
ACPI: restore CONFIG_ACPI_SLEEP
Restore the 2.6.22 CONFIG_ACPI_SLEEP build option, but now shadowing the new CONFIG_PM_SLEEP option. Signed-off-by: Len Brown <len.brown@intel.com> [ Modified to work with the PM config setup changes. ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/acpi/sleep/Makefile')
-rw-r--r--drivers/acpi/sleep/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/sleep/Makefile b/drivers/acpi/sleep/Makefile
index 2bec897ab1e..195a4f69c0f 100644
--- 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-$(CONFIG_ACPI_SLEEP) += main.o
+obj-$(CONFIG_ACPI_SLEEP) += proc.o
EXTRA_CFLAGS += $(ACPI_CFLAGS)