From: Mark Brown <broonie@linaro.org>
Date: Tue, 3 Jun 2014 09:39:50 +0000 (+0100)
Subject: Merge remote-tracking branches 'asoc/topic/gpio' and 'asoc/topic/intel' into asoc... 
X-Git-Tag: next-20140604~51^2~1^2~7
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=9713d5d0c4d841c6a08bf2a0bd0728ff44f0c231

Merge remote-tracking branches 'asoc/topic/gpio' and 'asoc/topic/intel' into asoc-next
---

9713d5d0c4d841c6a08bf2a0bd0728ff44f0c231
diff --cc sound/soc/intel/byt-rt5640.c
index 5535c3fb7922,eff97c8e5218,ac52c77721b1..53d160d39972
--- a/sound/soc/intel/byt-rt5640.c
+++ b/sound/soc/intel/byt-rt5640.c
@@@@ -167,8 -176,7 -151,7 +145,7 @@@@ static struct platform_driver byt_rt564
   	.driver = {
   		.name = "byt-rt5640",
   		.owner = THIS_MODULE,
-  		.pm = BYT_RT5640_PM_OPS,
++ 		.pm = &snd_soc_pm_ops,
   	},
   };
   module_platform_driver(byt_rt5640_audio)