diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-16 14:54:00 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-16 14:54:00 +0100 |
| commit | 2aff4c9ce898b9079658650c1ab33c44b100a203 (patch) | |
| tree | 66f3d8367c315c7fa1267bdb27d0bd923b8ce46f /sound/soc/ux500/ux500_msp_i2s.h | |
| parent | c48ae0ab3790efba2dfb1a4709c0ef8da024de1a (diff) | |
| parent | 701caa51a2ce74182d39380ca11defeb163d98c1 (diff) | |
| download | linux-2aff4c9ce898b9079658650c1ab33c44b100a203.tar.gz linux-2aff4c9ce898b9079658650c1ab33c44b100a203.tar.bz2 linux-2aff4c9ce898b9079658650c1ab33c44b100a203.zip | |
Merge tag 'asoc-v3.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.14
A few more updates for v3.14 since the last set, highlights include:
- Lots of DMA updates from Lars-Peter
- Improvements to the constraints handling code from Lars-Peter
- A very helpful conversion of the TWL4030 driver to regmap from Peter
- A new driver for the Freescale ESAI controller from Nicolin Chen
- Conversion of some of the drivers to use params_width()
Diffstat (limited to 'sound/soc/ux500/ux500_msp_i2s.h')
| -rw-r--r-- | sound/soc/ux500/ux500_msp_i2s.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 258d0bcee0bd..875de0f68b85 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -475,7 +475,7 @@ struct ux500_msp_dma_params { }; struct ux500_msp { - enum msp_i2s_id id; + int id; void __iomem *registers; struct device *dev; struct ux500_msp_dma_params playback_dma_data; |