Merge branch 'android-3.10' into 'dev-kernel-3.10'
authorSumit Singh <sumsingh@nvidia.com>
Mon, 1 Dec 2014 06:28:21 +0000 (11:28 +0530)
committerSumit Singh <sumsingh@nvidia.com>
Tue, 2 Dec 2014 06:59:49 +0000 (11:59 +0530)
commit9aefe2555053982e9318d80268a897ab9ed53a14
tree0ede9d128bff106e95a7d9389ea5c7f32aaf3693
parent43e9a5c3e8a8c7fa4f0cf6b5ca6bd8fc09aa51f2
parent06771dc53f546cde7f1ab55f03a2bb2fd2d7efa5
Merge branch 'android-3.10' into 'dev-kernel-3.10'

In the merge procedure, there was a new function
introduced 'pm_get_active_wakeup_sources', which was
defined only when CONFIG_PM_SLEEP enabled. So, when
this config was disabled, it was  giving build
failures for GVS.
So added its stub in suspend.h, so that it builds fine.

Bug 200058653

Change-Id: I8203c8e67f228a87d6bd82a45cbb435da3e0ab1a
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
include/linux/suspend.h