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 remote-tracking branches 'asoc/fix/ak4671', 'asoc/fix/control', 'asoc/fix/da732...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
iio
/
common
/
ssp_sensors
/
ssp_dev.c
diff --git
a/drivers/iio/common/ssp_sensors/ssp_dev.c
b/drivers/iio/common/ssp_sensors/ssp_dev.c
index 52d70435f5a11c55ed186003c70bce311002f918..55a90082a29bd4846aaea896f8c7f847d96fcb45 100644
(file)
--- a/
drivers/iio/common/ssp_sensors/ssp_dev.c
+++ b/
drivers/iio/common/ssp_sensors/ssp_dev.c
@@
-640,6
+640,7
@@
static int ssp_remove(struct spi_device *spi)
return 0;
}
return 0;
}
+#ifdef CONFIG_PM_SLEEP
static int ssp_suspend(struct device *dev)
{
int ret;
static int ssp_suspend(struct device *dev)
{
int ret;
@@
-688,6
+689,7
@@
static int ssp_resume(struct device *dev)
return 0;
}
return 0;
}
+#endif /* CONFIG_PM_SLEEP */
static const struct dev_pm_ops ssp_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(ssp_suspend, ssp_resume)
static const struct dev_pm_ops ssp_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(ssp_suspend, ssp_resume)