diff options
author | Mark Brown <broonie@kernel.org> | 2016-05-27 13:45:33 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-27 13:45:33 +0100 |
commit | fbbeb39183e08120b4116cdbadde91385f30d4f3 (patch) | |
tree | 637c0376c78132dd2a2fd1ae1d7b18ac9bf5ad56 /sound | |
parent | ae14dbfaa04180cc07b32ad6c3852d73917878d3 (diff) | |
parent | 7c3767115a04bc7aa87bdbd3352d1801d4bbeea4 (diff) | |
download | op-kernel-dev-fbbeb39183e08120b4116cdbadde91385f30d4f3.zip op-kernel-dev-fbbeb39183e08120b4116cdbadde91385f30d4f3.tar.gz |
Merge remote-tracking branch 'asoc/topic/simple' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/generic/simple-card.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 2389ab4..466492b 100644 --- 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, |