diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-02-01 18:43:05 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-01 18:43:05 +0100 |
| commit | 616ce0ae28eaaec238619b69ef952ae2f1aff587 (patch) | |
| tree | e457b9c2ccfbc54c87b07e48c61205210dfbe200 | |
| parent | f8db541c69a38f315f699a34b6e820aecd389d40 (diff) | |
| download | alsa-driver-build-unstable-616ce0ae28eaaec238619b69ef952ae2f1aff587.tar.gz | |
Fix yet another build error in ASoC for older kernels
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | soc/soc-core.patch | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/soc/soc-core.patch b/soc/soc-core.patch index f31fe5067..6ec58b39e 100644 --- a/soc/soc-core.patch +++ b/soc/soc-core.patch @@ -1,5 +1,5 @@ --- ../alsa-kernel/soc/soc-core.c 2011-02-01 17:32:46.000000000 +0100 -+++ soc-core.c 2011-02-01 17:42:58.000000000 +0100 ++++ soc-core.c 2011-02-01 18:42:44.023291050 +0100 @@ -1,3 +1,8 @@ +#include "adriver.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) @@ -9,7 +9,19 @@ /* * soc-core.c -- ALSA SoC Audio Layer * -@@ -1506,7 +1511,9 @@ +@@ -991,6 +996,11 @@ + .pointer = soc_pcm_pointer, + }; + ++/* XXX */ ++#if !defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM) ++#define CONFIG_PM_SLEEP ++#endif ++ + #ifdef CONFIG_PM_SLEEP + /* powers down audio subsystem for suspend */ + int snd_soc_suspend(struct device *dev) +@@ -1506,7 +1516,9 @@ rtd->card = card; rtd->dev.parent = card->dev; rtd->dev.release = rtd_release; @@ -19,7 +31,7 @@ ret = device_register(&rtd->dev); if (ret < 0) { dev_err(card->dev, -@@ -1972,21 +1979,43 @@ +@@ -1972,21 +1984,43 @@ } EXPORT_SYMBOL_GPL(snd_soc_poweroff); |