diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-08 09:58:25 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-08 09:58:25 -0500 |
| commit | 17a4adbe68c8e6c1fde8decb2345dc4acea87934 (patch) | |
| tree | 16d772ee8b5904ad9b92e1514e131bc504a079ae /sound/i2c/other/ak4113.c | |
| parent | c9adeefda0e29bed628e40e7f9da1f84243937e7 (diff) | |
| parent | 8bb4d9ce08b0a92ca174e41d92c180328f86173f (diff) | |
Merge branch 'for-linus' into for-next
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, |