projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/bcm2835', 'spi/fix/doc'...
[cascardo/linux.git]
/
drivers
/
spi
/
spi-atmel.c
diff --git
a/drivers/spi/spi-atmel.c
b/drivers/spi/spi-atmel.c
index
bf9ed38
..
63318e2
100644
(file)
--- a/
drivers/spi/spi-atmel.c
+++ b/
drivers/spi/spi-atmel.c
@@
-1720,6
+1720,7
@@
static int atmel_spi_runtime_resume(struct device *dev)
return clk_prepare_enable(as->clk);
}
return clk_prepare_enable(as->clk);
}
+#ifdef CONFIG_PM_SLEEP
static int atmel_spi_suspend(struct device *dev)
{
struct spi_master *master = dev_get_drvdata(dev);
static int atmel_spi_suspend(struct device *dev)
{
struct spi_master *master = dev_get_drvdata(dev);
@@
-1756,6
+1757,7
@@
static int atmel_spi_resume(struct device *dev)
return ret;
}
return ret;
}
+#endif
static const struct dev_pm_ops atmel_spi_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(atmel_spi_suspend, atmel_spi_resume)
static const struct dev_pm_ops atmel_spi_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(atmel_spi_suspend, atmel_spi_resume)