diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-19 02:03:20 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-19 02:03:20 -0400 |
| commit | 4609ed6b1f0ab9f11a9d0361573b53d9d057c440 (patch) | |
| tree | 802119cc6ddea286bc03d56431286ac52166352e /sound/soc/codecs/wm5100-tables.c | |
| parent | 639aa4bd58582f3015ae5621b7e9e754dcb58e6b (diff) | |
| parent | 409b78cc17a4a3d07a541037575da648ced99437 (diff) | |
Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for 3.6
This has been a pretty quiet release - very little activity in framework
terms, mostly just a few new drivers and updates:
- Added the ability to add and remove DAPM paths dynamically, mostly for
reparenting on clock changes.
- New machine drivers for Marvell Brownstone, ST-Ericsson Ux500
reference platform and ttc-dkp.
- New CPU drivers for Blackfin BF6xx SPORTs in I2S mode, Marvell MMP,
Synopsis Designware I2S controllers, and SPEAr DMA and S/PDIF
- New CODEC drivers for Dialog DA732x, ST STA529, ST-Ericsson AB8500, TI
Isabelle and Wolfson Microelectronics WM5102 and WM5110
Diffstat (limited to 'sound/soc/codecs/wm5100-tables.c')
| -rw-r--r-- | sound/soc/codecs/wm5100-tables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm5100-tables.c b/sound/soc/codecs/wm5100-tables.c index e167207a19cc..e239f4bf2460 100644 --- a/sound/soc/codecs/wm5100-tables.c +++ b/sound/soc/codecs/wm5100-tables.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * wm5100-tables.c -- WM5100 ALSA SoC Audio driver data | 2 | * wm5100-tables.c -- WM5100 ALSA SoC Audio driver data |
| 3 | * | 3 | * |
| 4 | * Copyright 2011 Wolfson Microelectronics plc | 4 | * Copyright 2011-2 Wolfson Microelectronics plc |
| 5 | * | 5 | * |
| 6 | * Author: Mark Brown <broonie@opensource.wolfsonmicro.com> | 6 | * Author: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| 7 | * | 7 | * |