git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/spear', 'asoc/topic...
[sfrench/cifs-2.6.git]
/
sound
/
soc
/
generic
/
audio-graph-scu-card.c
diff --git
a/sound/soc/generic/audio-graph-scu-card.c
b/sound/soc/generic/audio-graph-scu-card.c
index 06b6fcf0513ed31a401dc1967ca9de711392e73c..a967aa143d51864cb03e3c9f8fcb9c7ea72c8a51 100644
(file)
--- a/
sound/soc/generic/audio-graph-scu-card.c
+++ b/
sound/soc/generic/audio-graph-scu-card.c
@@
-401,6
+401,7
@@
MODULE_DEVICE_TABLE(of, asoc_graph_of_match);
static struct platform_driver asoc_graph_card = {
.driver = {
.name = "asoc-audio-graph-scu-card",
static struct platform_driver asoc_graph_card = {
.driver = {
.name = "asoc-audio-graph-scu-card",
+ .pm = &snd_soc_pm_ops,
.of_match_table = asoc_graph_of_match,
},
.probe = asoc_graph_card_probe,
.of_match_table = asoc_graph_of_match,
},
.probe = asoc_graph_card_probe,