diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-07-21 14:39:06 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-07-21 14:39:06 -0700 |
| commit | d6348a53b9f9d776358b7261dfcdab06ffeafc78 (patch) | |
| tree | c457cfa36d17817d8e4b6f7e43452cc2e929246e /kernel/power/Makefile | |
| parent | 3371370efef73fef66926509b6e84248c6731c97 (diff) | |
| parent | d74348cebf7b883a872c5f0cfdf815855e08db5a (diff) | |
Merge branch 'upstream/android-3.0' into linaro-android-3.0
Diffstat (limited to 'kernel/power/Makefile')
| -rw-r--r-- | kernel/power/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/power/Makefile b/kernel/power/Makefile index 493f19d2a29..9b224e16b19 100644 --- a/kernel/power/Makefile +++ b/kernel/power/Makefile @@ -13,5 +13,6 @@ obj-$(CONFIG_USER_WAKELOCK) += userwakelock.o obj-$(CONFIG_EARLYSUSPEND) += earlysuspend.o obj-$(CONFIG_CONSOLE_EARLYSUSPEND) += consoleearlysuspend.o obj-$(CONFIG_FB_EARLYSUSPEND) += fbearlysuspend.o +obj-$(CONFIG_SUSPEND_TIME) += suspend_time.o obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o |