diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-06 17:07:39 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-06 17:07:39 +0800 |
| commit | 6af5263ceaffc9d4403592dc81cd3b197702dc69 (patch) | |
| tree | 4c144be49e1ade130571d0169e259e9966177962 /include/sound/soc-dai.h | |
| parent | 234c0b8fb0db790aaebec07d1d190e789d8ec7b9 (diff) | |
| parent | 3d59400fe47e7e8bfb024cd1651433bef42e268e (diff) | |
| download | linux-6af5263ceaffc9d4403592dc81cd3b197702dc69.tar.bz2 | |
Merge branch 'topic/pcm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-enum
Conflicts:
include/sound/soc.h
Diffstat (limited to 'include/sound/soc-dai.h')
| -rw-r--r-- | include/sound/soc-dai.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 71f27c403194..8763e539c487 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -270,6 +270,7 @@ struct snd_soc_dai { /* parent platform/codec */ struct snd_soc_platform *platform; struct snd_soc_codec *codec; + struct snd_soc_component *component; struct snd_soc_card *card; |