diff options
| author | Mark Brown <broonie@kernel.org> | 2018-04-16 12:58:21 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-04-16 12:58:21 +0100 |
| commit | 953de782cccf7a84e8a20cea72aea2a056fea3bf (patch) | |
| tree | dfe61f7d4b7addd15ac6ce7978a4bb632f5bf626 /sound/soc/sh | |
| parent | 3fd391fb7c97ab6dfb9e44926a265566d1d1ab79 (diff) | |
| parent | d0f8b9c5a350ca6fa842b52bfb88b77b34ee485b (diff) | |
Merge branch 'asoc-4.17' into asoc-4.18 to get adau17x1 changes so
further patches can be applied.
Diffstat (limited to 'sound/soc/sh')
| -rw-r--r-- | sound/soc/sh/rcar/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index f9ac086d8e05..af04d41a4274 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1573,7 +1573,7 @@ static int rsnd_remove(struct platform_device *pdev) return ret; } -static int rsnd_suspend(struct device *dev) +static int __maybe_unused rsnd_suspend(struct device *dev) { struct rsnd_priv *priv = dev_get_drvdata(dev); @@ -1582,7 +1582,7 @@ static int rsnd_suspend(struct device *dev) return 0; } -static int rsnd_resume(struct device *dev) +static int __maybe_unused rsnd_resume(struct device *dev) { struct rsnd_priv *priv = dev_get_drvdata(dev); |