diff options
author | Greg Kroah-Hartman | 2014-02-24 13:33:45 -0800 |
---|---|---|
committer | Greg Kroah-Hartman | 2014-02-24 13:33:45 -0800 |
commit | 35efc5a425e3db676b3d1ab9f23705a3977cfdcd (patch) | |
tree | 5dd2f9211b17eaad73f09bdc80172bea7dbb0760 /sound/soc/davinci/davinci-evm.c | |
parent | 0a191749ce19112f8f20675232b951dccd4ae00e (diff) | |
parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) |
Merge 3.14-rc4 into char-misc-next
We want these fixes here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/davinci/davinci-evm.c')
-rw-r--r-- | sound/soc/davinci/davinci-evm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/davinci/davinci-evm.c index 70ff3772079f..5e3bc3c6801a 100644 --- a/sound/soc/davinci/davinci-evm.c +++ b/sound/soc/davinci/davinci-evm.c @@ -399,6 +399,7 @@ static struct platform_driver davinci_evm_driver = { .driver = { .name = "davinci_evm", .owner = THIS_MODULE, + .pm = &snd_soc_pm_ops, .of_match_table = of_match_ptr(davinci_evm_dt_ids), }, }; |