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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
[cascardo/linux.git]
/
drivers
/
rtc
/
rtc-cmos.c
diff --git
a/drivers/rtc/rtc-cmos.c
b/drivers/rtc/rtc-cmos.c
index
cae212f
..
0963c93
100644
(file)
--- a/
drivers/rtc/rtc-cmos.c
+++ b/
drivers/rtc/rtc-cmos.c
@@
-837,7
+837,7
@@
static void __exit cmos_do_remove(struct device *dev)
cmos->dev = NULL;
}
cmos->dev = NULL;
}
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM
_SLEEP
static int cmos_suspend(struct device *dev)
{
static int cmos_suspend(struct device *dev)
{
@@
-935,8
+935,6
@@
static int cmos_resume(struct device *dev)
return 0;
}
return 0;
}
-static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume);
-
#else
static inline int cmos_poweroff(struct device *dev)
#else
static inline int cmos_poweroff(struct device *dev)
@@
-946,6
+944,8
@@
static inline int cmos_poweroff(struct device *dev)
#endif
#endif
+static SIMPLE_DEV_PM_OPS(cmos_pm_ops, cmos_suspend, cmos_resume);
+
/*----------------------------------------------------------------*/
/* On non-x86 systems, a "CMOS" RTC lives most naturally on platform_bus.
/*----------------------------------------------------------------*/
/* On non-x86 systems, a "CMOS" RTC lives most naturally on platform_bus.
@@
-1088,11
+1088,9
@@
static struct pnp_driver cmos_pnp_driver = {
/* flag ensures resume() gets called, and stops syslog spam */
.flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
/* flag ensures resume() gets called, and stops syslog spam */
.flags = PNP_DRIVER_RES_DO_NOT_CHANGE,
-#ifdef CONFIG_PM_SLEEP
.driver = {
.pm = &cmos_pm_ops,
},
.driver = {
.pm = &cmos_pm_ops,
},
-#endif
};
#endif /* CONFIG_PNP */
};
#endif /* CONFIG_PNP */