diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-04-19 09:04:44 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-04-19 09:04:44 +0200 |
| commit | 0ecf023eb8698b40be9b4876732556466f470905 (patch) | |
| tree | d501e97a1cce8f70df189dba6aeff7bb48a52eef | |
| parent | a10ae3ec328432a7fb2f3c1c9d6367e9a28e259f (diff) | |
| download | alsa-driver-build-unstable-0ecf023eb8698b40be9b4876732556466f470905.tar.gz | |
Regenerated soc/soc-core.patch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | soc/soc-core.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/soc/soc-core.patch b/soc/soc-core.patch index 477dee216..9d22bc9a2 100644 --- a/soc/soc-core.patch +++ b/soc/soc-core.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/soc/soc-core.c 2011-02-08 17:32:02.153652411 +0100 -+++ soc-core.c 2011-02-14 17:17:06.144459431 +0100 +--- ../alsa-kernel/soc/soc-core.c 2011-04-19 08:29:42.000000000 +0200 ++++ soc-core.c 2011-04-19 09:03:08.000000000 +0200 @@ -1,3 +1,8 @@ +#include "adriver.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) @@ -9,7 +9,7 @@ /* * soc-core.c -- ALSA SoC Audio Layer * -@@ -1027,6 +1032,11 @@ +@@ -1037,6 +1042,11 @@ .pointer = soc_pcm_pointer, }; @@ -21,7 +21,7 @@ #ifdef CONFIG_PM_SLEEP /* powers down audio subsystem for suspend */ int snd_soc_suspend(struct device *dev) -@@ -1542,7 +1552,9 @@ +@@ -1573,7 +1583,9 @@ rtd->codec = codec; rtd->dev.parent = card->dev; rtd->dev.release = rtd_release; @@ -31,7 +31,7 @@ ret = device_register(&rtd->dev); if (ret < 0) { dev_err(card->dev, -@@ -2008,21 +2020,43 @@ +@@ -2077,22 +2089,44 @@ } EXPORT_SYMBOL_GPL(snd_soc_poweroff); @@ -41,6 +41,7 @@ .resume = snd_soc_resume, .poweroff = snd_soc_poweroff, }; + EXPORT_SYMBOL_GPL(snd_soc_pm_ops); +#else +#ifdef CONFIG_PM +static int soc_old_suspend(struct platform_device *pdev, pm_message_t state) |