diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-05 01:08:35 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-05 01:08:35 -0500 |
| commit | a3ae255e3729c1bb4507412ea29be804f703d44c (patch) | |
| tree | edd1ca577dad5a0d701ae111519eaefa60896f98 /sound/soc/mxs/mxs-saif.h | |
| parent | 3fe9cf390f6dc84f76b112b0a660967a84f9a81b (diff) | |
| parent | 16ca41c6cc904d7eb9e92afc5f576e375c314f90 (diff) | |
Merge tag 'asoc-v3.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.20
More updates for v3.20:
- Lots of refactoring from Lars-Peter Clausen, moving drivers to more
data driven initialization and rationalizing a lot of DAPM usage.
- Much improved handling of CDCLK clocks on Samsung I2S controllers.
- Lots of driver specific cleanups and feature improvements.
- CODEC support for TI PCM514x and TLV320AIC3104 devices.
- Board support for Tegra systems with Realtek RT5677.
Conflicts:
sound/soc/intel/sst-mfld-platform-pcm.c
Diffstat (limited to 'sound/soc/mxs/mxs-saif.h')
| -rw-r--r-- | sound/soc/mxs/mxs-saif.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/mxs/mxs-saif.h b/sound/soc/mxs/mxs-saif.h index fbaf7badfdfb..9a4c0b291b9e 100644 --- a/sound/soc/mxs/mxs-saif.h +++ b/sound/soc/mxs/mxs-saif.h | |||
| @@ -116,7 +116,6 @@ struct mxs_saif { | |||
| 116 | unsigned int mclk; | 116 | unsigned int mclk; |
| 117 | unsigned int mclk_in_use; | 117 | unsigned int mclk_in_use; |
| 118 | void __iomem *base; | 118 | void __iomem *base; |
| 119 | int irq; | ||
| 120 | unsigned int id; | 119 | unsigned int id; |
| 121 | unsigned int master_id; | 120 | unsigned int master_id; |
| 122 | unsigned int cur_rate; | 121 | unsigned int cur_rate; |