git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
pm.c
diff --git
a/arch/arm/mach-omap2/pm.c
b/arch/arm/mach-omap2/pm.c
index 0598630c17786242d20277fe59e9bbdb9cc9e928..63027e60cc209f1cb9b6067958ff692813233665 100644
(file)
--- a/
arch/arm/mach-omap2/pm.c
+++ b/
arch/arm/mach-omap2/pm.c
@@
-163,7
+163,6
@@
static int omap_pm_enter(suspend_state_t suspend_state)
return -ENOENT; /* XXX doublecheck */
switch (suspend_state) {
- case PM_SUSPEND_STANDBY:
case PM_SUSPEND_MEM:
ret = omap_pm_suspend();
break;