diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2011-10-03 09:39:09 +0200 |
|---|---|---|
| committer | Yvan FILLION <yvan.fillion@stericsson.com> | 2011-10-03 17:45:07 +0200 |
| commit | 0208a1c8a0f7f465963aec091d87fa2cba169c14 (patch) | |
| tree | cf8055a604deab1e2c9caaa5b4dd06feca307689 | |
| parent | d8ab662b5250a5e4704047d5a70251e7f09f4226 (diff) | |
[ANDROID]: ARM: ux500: allow suspend again
ST-Ericsson Linux next: -
ST-Ericsson ID: -
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I7e51e5c158e41b20cc7a9da211382cef7b8bf307
Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32798
Reviewed-by: Venkata Biswanath DEVARASETTY <venkata.biswanath@stericsson.com>
Tested-by: Venkata Biswanath DEVARASETTY <venkata.biswanath@stericsson.com>
Reviewed-by: Yvan FILLION <yvan.fillion@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/pm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/pm/no_suspend.c | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/arch/arm/mach-ux500/pm/Makefile b/arch/arm/mach-ux500/pm/Makefile index d6922d66318..c0af28e5d3e 100644 --- a/arch/arm/mach-ux500/pm/Makefile +++ b/arch/arm/mach-ux500/pm/Makefile @@ -1,7 +1,7 @@ # # Power save related files # -obj-y := pm.o runtime.o no_suspend.o +obj-y := pm.o runtime.o obj-$(CONFIG_DBX500_PRCMU_QOS_POWER) += prcmu-qos-power.o obj-$(CONFIG_UX500_CONTEXT) += context.o context_arm.o context-db8500.o context-db5500.o diff --git a/arch/arm/mach-ux500/pm/no_suspend.c b/arch/arm/mach-ux500/pm/no_suspend.c deleted file mode 100644 index 9eb77514f3c..00000000000 --- a/arch/arm/mach-ux500/pm/no_suspend.c +++ /dev/null @@ -1,14 +0,0 @@ - -#include <linux/kernel.h> -#include <linux/wakelock.h> - -/* Temporary suspend blocker until suspend works */ - -static struct wake_lock wakelock; -static int __init take_wake_lock(void) -{ - wake_lock_init(&wakelock, WAKE_LOCK_SUSPEND, "no_suspend"); - wake_lock(&wakelock); - return 0; -} -late_initcall(take_wake_lock); |