Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next

497c11a9 · Mark Brown · b79e16cb · ccffbd27 · 497c11a9
Commit 497c11a9 authored May 22, 2014 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sound/soc/codecs/pcm512x.c sound/soc/codecs/pcm512x.c +2 -0

No files found.
--- a/sound/soc/codecs/pcm512x.c
+++ b/sound/soc/codecs/pcm512x.c
@@ -517,6 +517,7 @@ void pcm512x_remove(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(pcm512x_remove);

+#ifdef CONFIG_PM_RUNTIME
 static int pcm512x_suspend(struct device *dev)
 {
 	struct pcm512x_priv *pcm512x = dev_get_drvdata(dev);
@@ -578,6 +579,7 @@ static int pcm512x_resume(struct device *dev)

 	return 0;
 }
+#endif

 const struct dev_pm_ops pcm512x_pm_ops = {
 	SET_RUNTIME_PM_OPS(pcm512x_suspend, pcm512x_resume, NULL)