diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-31 09:46:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-31 09:46:42 +0100 |
| commit | 0f8dd4ce4775806196300dc075ba8d4f1f9b605d (patch) | |
| tree | 97045026e9780707706149b2ad19e4cc24c78d75 /sound/soc/soc-dapm.c | |
| parent | ASoC: imx: use more robust checking of available streams (diff) | |
| parent | ASoC: Fix register cache sync register_writable WARN_ONs (diff) | |
| download | linux-dev-0f8dd4ce4775806196300dc075ba8d4f1f9b605d.tar.xz linux-dev-0f8dd4ce4775806196300dc075ba8d4f1f9b605d.zip | |
Merge branch 'for-3.1' into for-3.2
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 170c4ffa609f..4859ad77eac7 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2771,7 +2771,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. */ |