diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-04 09:16:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-04 09:16:36 +0200 |
| commit | 48e64dd3de170f9216a6a69ad437ed10583cb803 (patch) | |
| tree | 8ec518781b17eb5fe2f39d811a2f4683df5c684c | |
| parent | edd1da6ac27f160b49f1d25c2c836da1af6df34c (diff) | |
| download | alsa-driver-build-unstable-48e64dd3de170f9216a6a69ad437ed10583cb803.tar.gz | |
Fix soc-core build with 2.6.26 or older kernels
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | soc/soc-core.patch | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/soc/soc-core.patch b/soc/soc-core.patch index fd608116f..988e1d097 100644 --- a/soc/soc-core.patch +++ b/soc/soc-core.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/soc/soc-core.c 2009-12-18 14:00:11.000000000 +0100 -+++ soc-core.c 2009-12-18 14:08:12.000000000 +0100 +--- ../alsa-kernel/soc/soc-core.c 2010-09-30 23:00:05.764410616 +0200 ++++ soc-core.c 2010-10-04 09:16:06.920758499 +0200 @@ -1,3 +1,8 @@ +#include "adriver.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) @@ -9,7 +9,17 @@ /* * soc-core.c -- ALSA SoC Audio Layer * -@@ -1236,21 +1241,43 @@ +@@ -1452,7 +1457,9 @@ + + /* register the rtd device */ + rtd->dev.release = rtd_release; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) + rtd->dev.init_name = dai_link->name; ++#endif + ret = device_register(&rtd->dev); + if (ret < 0) { + printk(KERN_ERR "asoc: failed to register DAI runtime device %d\n", ret); +@@ -1693,21 +1700,43 @@ return 0; } |