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 'for-linus' of git://oss.sgi.com/xfs/xfs
[sfrench/cifs-2.6.git]
/
drivers
/
s390
/
char
/
sclp.c
diff --git
a/drivers/s390/char/sclp.c
b/drivers/s390/char/sclp.c
index a983f50867881643f06ad0b2364fc5b9cbf2bb04..ec88c59842e3532d1b3b6fde3a402a9101b18266 100644
(file)
--- a/
drivers/s390/char/sclp.c
+++ b/
drivers/s390/char/sclp.c
@@
-1019,7
+1019,7
@@
static int sclp_restore(struct device *dev)
return sclp_undo_suspend(SCLP_PM_EVENT_RESTORE);
}
-static struct dev_pm_ops sclp_pm_ops = {
+static
const
struct dev_pm_ops sclp_pm_ops = {
.freeze = sclp_freeze,
.thaw = sclp_thaw,
.restore = sclp_restore,