diff options
| author | Mandar padmawar <mpadmawar@nvidia.com> | 2014-05-29 23:28:18 -0700 |
|---|---|---|
| committer | Mandar padmawar <mpadmawar@nvidia.com> | 2014-05-29 23:28:18 -0700 |
| commit | abf9c41277d27ad35cb2dc036dd9c427e8d316e7 (patch) | |
| tree | 7a7502259b67a5ef54a168099165ffa19159aa22 /kernel/power/Makefile | |
| parent | a39d4a70d52df4a9d4a74c818880b73d684db8c7 (diff) | |
| parent | 75c1032e7b6215de41e451a01033a342372105d4 (diff) | |
Merge commit 'refs/changes/16/411516/5' of ssh://git-master:12001/linux-3.10 into promotion_build
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 8450b85d33c0..74c713ba61b0 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -14,3 +14,5 @@ obj-$(CONFIG_PM_WAKELOCKS) += wakelock.o obj-$(CONFIG_SUSPEND_TIME) += suspend_time.o obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o + +obj-$(CONFIG_SUSPEND) += wakeup_reason.o |