diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:17 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-17 17:20:17 +0100 |
| commit | 9805fe391d918d5127530ca7741904407d28f428 (patch) | |
| tree | 3f744f9fc4a7fea5e5ca8e2e0558723828e3b1d3 /include | |
| parent | 70fe99d8dbbcff8b61b613e738e9d133ed2d2b15 (diff) | |
| parent | 656ca9d327a3dbac6db28c5bf80f5bc86f7f8548 (diff) | |
| download | linux-9805fe391d918d5127530ca7741904407d28f428.tar.gz linux-9805fe391d918d5127530ca7741904407d28f428.tar.bz2 linux-9805fe391d918d5127530ca7741904407d28f428.zip | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/soc-dapm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 69e8e0799d4d..3e479f4e15f5 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -481,7 +481,6 @@ struct snd_soc_dapm_route { /* dapm audio path between two widgets */ struct snd_soc_dapm_path { const char *name; - const char *long_name; /* source (input) and sink (output) widgets */ struct snd_soc_dapm_widget *source; |