projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[cascardo/linux.git]
/
drivers
/
rtc
/
rtc-cmos.c
diff --git
a/drivers/rtc/rtc-cmos.c
b/drivers/rtc/rtc-cmos.c
index
b0e4a3e
..
5b2e761
100644
(file)
--- a/
drivers/rtc/rtc-cmos.c
+++ b/
drivers/rtc/rtc-cmos.c
@@
-856,7
+856,7
@@
static void __exit cmos_do_remove(struct device *dev)
cmos->dev = NULL;
}
cmos->dev = NULL;
}
-#ifdef CONFIG_PM
_SLEEP
+#ifdef CONFIG_PM
static int cmos_suspend(struct device *dev)
{
static int cmos_suspend(struct device *dev)
{
@@
-907,6
+907,8
@@
static inline int cmos_poweroff(struct device *dev)
return cmos_suspend(dev);
}
return cmos_suspend(dev);
}
+#ifdef CONFIG_PM_SLEEP
+
static int cmos_resume(struct device *dev)
{
struct cmos_rtc *cmos = dev_get_drvdata(dev);
static int cmos_resume(struct device *dev)
{
struct cmos_rtc *cmos = dev_get_drvdata(dev);
@@
-954,6
+956,7
@@
static int cmos_resume(struct device *dev)
return 0;
}
return 0;
}
+#endif
#else
static inline int cmos_poweroff(struct device *dev)
#else
static inline int cmos_poweroff(struct device *dev)