diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-11 09:47:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-11 09:47:53 +0000 |
| commit | 943550a24c51bdd971f579200f286241548deaf7 (patch) | |
| tree | 4b275941890744cf4ea588ea59db7cd6558647b6 /kernel/power/Makefile | |
| parent | 0356888ad14044efe98b16a731ba56d74b89269e (diff) | |
| parent | a3b71254e95dc167ddca600c0ca426e8ce2fad3f (diff) | |
Merge branch 'linaro-android-3.10-lsk' of git://git.linaro.org/people/jstultz/android into linux-linaro-lsk-androidlsk-android-14.03
Conflicts:
arch/arm64/include/asm/cmpxchg.h
drivers/cpufreq/cpufreq.c
include/net/tcp.h
net/ipv4/ping.c
net/ipv4/sysctl_net_ipv4.c
net/netfilter/xt_qtaguid.c
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 |