projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'master-2014-09-23' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
power
/
suspend.c
diff --git
a/kernel/power/suspend.c
b/kernel/power/suspend.c
index 6dadb25cb0d8023f987c2c0961f1f81b7fedb0ce..18c62195660f6c6c458d74346ee7979ec4388db4 100644
(file)
--- a/
kernel/power/suspend.c
+++ b/
kernel/power/suspend.c
@@
-31,7
+31,7
@@
#include "power.h"
-
static const char *pm_labels[] = { "mem", "standby", "freeze",
};
+
const char *pm_labels[] = { "mem", "standby", "freeze", NULL
};
const char *pm_states[PM_SUSPEND_MAX];
static const struct platform_suspend_ops *suspend_ops;