diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 14:44:30 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-05-27 14:44:30 +1000 |
| commit | b93534050b8b048c3f1f0cf1fa84aa733acc207d (patch) | |
| tree | 829628ec0f1a3143a97a06b28dac280affb2d50d /kernel/power/Makefile | |
| parent | 69146ae8774832d62c0b633a9a42b1711c410f7a (diff) | |
| parent | dcc4aba7b6df76136f526e1b4d2c15e1fb611941 (diff) | |
Merge remote branch 'suspend/linux-next'
Diffstat (limited to 'kernel/power/Makefile')
| -rw-r--r-- | kernel/power/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index 524e058dcf06..76568fec37be 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -7,6 +7,8 @@ obj-$(CONFIG_PM) += main.o obj-$(CONFIG_PM_SLEEP) += console.o obj-$(CONFIG_FREEZER) += process.o obj-$(CONFIG_SUSPEND) += suspend.o +obj-$(CONFIG_OPPORTUNISTIC_SUSPEND) += opportunistic_suspend.o +obj-$(CONFIG_USER_SUSPEND_BLOCKERS) += user_suspend_blocker.o obj-$(CONFIG_PM_TEST_SUSPEND) += suspend_test.o obj-$(CONFIG_HIBERNATION) += hibernate.o snapshot.o swap.o user.o \ block_io.o |