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
/
rtc
/
rtc-sh.c
diff --git
a/drivers/rtc/rtc-sh.c
b/drivers/rtc/rtc-sh.c
index e6ed5404bca0e8d32d4623bd123c6d0b8e6a1b54..e95cc6f8d61e28c035fed8d0648fd92463ed595e 100644
(file)
--- a/
drivers/rtc/rtc-sh.c
+++ b/
drivers/rtc/rtc-sh.c
@@
-826,7
+826,7
@@
static int sh_rtc_resume(struct device *dev)
return 0;
}
-static struct dev_pm_ops sh_rtc_dev_pm_ops = {
+static
const
struct dev_pm_ops sh_rtc_dev_pm_ops = {
.suspend = sh_rtc_suspend,
.resume = sh_rtc_resume,
};