diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 15:01:25 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 15:01:25 -0500 |
| commit | 459d2a9f5fcf125ba736f7843189ccdfba11b1ff (patch) | |
| tree | 6664f0ae653081521a3e1df0c506a2532ae6168e /sound/i2c/other/ak4113.c | |
| parent | 1428c20f7c38e9fbf59923d1b9615ebdaf2862b7 (diff) | |
| parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
Merge tag 'v3.7-rc7' into asoc-ux500
Linux 3.7-rc7
Diffstat (limited to 'sound/i2c/other/ak4113.c')
| -rw-r--r-- | sound/i2c/other/ak4113.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/i2c/other/ak4113.c b/sound/i2c/other/ak4113.c index ef68d710d08c..e04e750a77ed 100644 --- a/sound/i2c/other/ak4113.c +++ b/sound/i2c/other/ak4113.c | |||
| @@ -426,7 +426,7 @@ static struct snd_kcontrol_new snd_ak4113_iec958_controls[] = { | |||
| 426 | }, | 426 | }, |
| 427 | { | 427 | { |
| 428 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | 428 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
| 429 | .name = "IEC958 Preample Capture Default", | 429 | .name = "IEC958 Preamble Capture Default", |
| 430 | .access = SNDRV_CTL_ELEM_ACCESS_READ | | 430 | .access = SNDRV_CTL_ELEM_ACCESS_READ | |
| 431 | SNDRV_CTL_ELEM_ACCESS_VOLATILE, | 431 | SNDRV_CTL_ELEM_ACCESS_VOLATILE, |
| 432 | .info = snd_ak4113_spdif_pinfo, | 432 | .info = snd_ak4113_spdif_pinfo, |