diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-21 19:23:45 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-21 19:23:45 -0400 |
| commit | 497c11a946015f4b3d5fca91a17a79f134741642 (patch) | |
| tree | 0ea63a8fba7e9e3722e00ded52c52a7ceb54034b | |
| parent | b79e16cb4a7d8160d3e4eda5f547eba90630b3a8 (diff) | |
| parent | ccffbd27af95700f6e46f5300fcc96c0cda9f178 (diff) | |
Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next
| -rw-r--r-- | sound/soc/codecs/pcm512x.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index 381d22ce6f76..163ec3855fd4 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c | |||
| @@ -517,6 +517,7 @@ void pcm512x_remove(struct device *dev) | |||
| 517 | } | 517 | } |
| 518 | EXPORT_SYMBOL_GPL(pcm512x_remove); | 518 | EXPORT_SYMBOL_GPL(pcm512x_remove); |
| 519 | 519 | ||
| 520 | #ifdef CONFIG_PM_RUNTIME | ||
| 520 | static int pcm512x_suspend(struct device *dev) | 521 | static int pcm512x_suspend(struct device *dev) |
| 521 | { | 522 | { |
| 522 | struct pcm512x_priv *pcm512x = dev_get_drvdata(dev); | 523 | struct pcm512x_priv *pcm512x = dev_get_drvdata(dev); |
| @@ -578,6 +579,7 @@ static int pcm512x_resume(struct device *dev) | |||
| 578 | 579 | ||
| 579 | return 0; | 580 | return 0; |
| 580 | } | 581 | } |
| 582 | #endif | ||
| 581 | 583 | ||
| 582 | const struct dev_pm_ops pcm512x_pm_ops = { | 584 | const struct dev_pm_ops pcm512x_pm_ops = { |
| 583 | SET_RUNTIME_PM_OPS(pcm512x_suspend, pcm512x_resume, NULL) | 585 | SET_RUNTIME_PM_OPS(pcm512x_suspend, pcm512x_resume, NULL) |