Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[~andy/linux] / kernel / power / Makefile

diff --git a/kernel/power/Makefile b/kernel/power/Makefile
index 66d808ec525234bfee1433a4df2c33ff9c399201..29472bff11ef9b1c902e71a7ae9823a9e36c06e6 100644 (file)
--- a/kernel/power/Makefile
+++ b/kernel/power/Makefile
@@ -9,5 +9,7 @@ obj-$(CONFIG_SUSPEND)           += suspend.o
 obj-$(CONFIG_PM_TEST_SUSPEND)  += suspend_test.o
 obj-$(CONFIG_HIBERNATION)      += hibernate.o snapshot.o swap.o user.o \
                                   block_io.o
+obj-$(CONFIG_PM_AUTOSLEEP)     += autosleep.o
+obj-$(CONFIG_PM_WAKELOCKS)     += wakelock.o
 
 obj-$(CONFIG_MAGIC_SYSRQ)      += poweroff.o