diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-12-08 17:37:45 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-12-08 17:37:45 +0100 |
| commit | 35d4f145aad655eeec7ac117f2c5fe083f13a3b3 (patch) | |
| tree | cfcc4fbabe2ff80428e633810ca99c4ea622c00a | |
| parent | a8eaa57d5d84aa8b15f965728485338e1af4d9a5 (diff) | |
| download | alsa-driver-build-unstable-35d4f145aad655eeec7ac117f2c5fe083f13a3b3.tar.gz | |
Regenerated soc-core.patch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | soc/soc-core.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/soc/soc-core.patch b/soc/soc-core.patch index 988e1d097..7f73cbaea 100644 --- a/soc/soc-core.patch +++ b/soc/soc-core.patch @@ -1,5 +1,5 @@ ---- ../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 +--- ../alsa-kernel/soc/soc-core.c 2010-12-08 17:36:03.000000000 +0100 ++++ soc-core.c 2010-12-08 17:36:56.000000000 +0100 @@ -1,3 +1,8 @@ +#include "adriver.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) @@ -9,17 +9,17 @@ /* * soc-core.c -- ALSA SoC Audio Layer * -@@ -1452,7 +1457,9 @@ - - /* register the rtd device */ +@@ -1496,7 +1501,9 @@ + rtd->card = card; + rtd->dev.parent = card->dev; rtd->dev.release = rtd_release; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) - rtd->dev.init_name = dai_link->name; + rtd->dev.init_name = 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 @@ + dev_err(card->dev, +@@ -1966,21 +1973,43 @@ return 0; } |