diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
commit | 0308110615acb4b6409fe042caf22bb9fb075d85 (patch) | |
tree | d129f11ebdbe49b21246a72e6ba52c50e81e8e7e /sound/soc/soc-dapm.c | |
parent | c731bc96ad641a5fa3d50a87b474652505507282 (diff) | |
parent | 763437a9e7737535b2fc72175ad4974048769be6 (diff) | |
download | linux-3.10-0308110615acb4b6409fe042caf22bb9fb075d85.tar.gz linux-3.10-0308110615acb4b6409fe042caf22bb9fb075d85.tar.bz2 linux-3.10-0308110615acb4b6409fe042caf22bb9fb075d85.zip |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/soc/soc-dapm.c')
-rw-r--r-- | sound/soc/soc-dapm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 7e15914b363..d67c637557a 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2763,7 +2763,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend); /** * snd_soc_dapm_free - free dapm resources - * @card: SoC device + * @dapm: DAPM context * * Free all dapm widgets and resources. */ |