diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-25 19:18:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-25 19:18:00 +0100 |
| commit | c64f976208f7f6d16ae0b980f8af42fb18759ace (patch) | |
| tree | 0439de1b6a0226e7356673720e59bee4d5bef673 /sound/soc/intel/boards/haswell.c | |
| parent | 2dcd0af568b0cf583645c8a317dd12e344b1c72a (diff) | |
| parent | 515511a7920c69aebf7f5fef0cb8e1df6767f34c (diff) | |
| download | linux-c64f976208f7f6d16ae0b980f8af42fb18759ace.tar.bz2 | |
Merge tag 'asoc-v4.7' into asoc-linus
ASoC: Updates for v4.7
The updates this time around are almost all driver code:
- Further slow progress on the topology code.
- Substantial updates and improvements for the da7219, es8328, fsl-ssi
Intel and rcar drivers.
# gpg: Signature made Mon 16 May 2016 12:08:43 BST using RSA key ID 5D5487D0
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg: aka "Mark Brown <broonie@debian.org>"
# gpg: aka "Mark Brown <broonie@kernel.org>"
# gpg: aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg: aka "Mark Brown <broonie@linaro.org>"
# gpg: aka "Mark Brown <Mark.Brown@linaro.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 3F25 68AA C269 98F9 E813 A1C5 C3F4 36CA 30F5 D8EB
# Subkey fingerprint: ADE6 68AA 6757 18B5 9FE2 9FEA 24D6 8B72 5D54 87D0
Diffstat (limited to 'sound/soc/intel/boards/haswell.c')
| -rw-r--r-- | sound/soc/intel/boards/haswell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/boards/haswell.c b/sound/soc/intel/boards/haswell.c index 22558572cb9c..863f1d5e2a2c 100644 --- a/sound/soc/intel/boards/haswell.c +++ b/sound/soc/intel/boards/haswell.c @@ -156,7 +156,7 @@ static struct snd_soc_dai_link haswell_rt5640_dais[] = { { /* SSP0 - Codec */ .name = "Codec", - .be_id = 0, + .id = 0, .cpu_dai_name = "snd-soc-dummy-dai", .platform_name = "snd-soc-dummy", .no_pcm = 1, |