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

diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 2389ab47e25f68265c720ba3f4c4b52e5c321e59..466492b7d4f59d00f115a92867031ea046832581 100644 (file)
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -643,6 +643,7 @@ MODULE_DEVICE_TABLE(of, asoc_simple_of_match);
 static struct platform_driver asoc_simple_card = {
        .driver = {
                .name = "asoc-simple-card",
+               .pm = &snd_soc_pm_ops,
                .of_match_table = asoc_simple_of_match,
        },
        .probe = asoc_simple_card_probe,