diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-11-08 15:58:25 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-11-08 15:58:25 +0100 |
| commit | 17a4adbe68c8e6c1fde8decb2345dc4acea87934 (patch) | |
| tree | 16d772ee8b5904ad9b92e1514e131bc504a079ae /sound/i2c/other/ak4117.c | |
| parent | ALSA: hda - Keep power link on for PantherPoint HDMI (diff) | |
| parent | ALSA: Fix card refcount unbalance (diff) | |
| download | linux-17a4adbe68c8e6c1fde8decb2345dc4acea87934.tar.xz linux-17a4adbe68c8e6c1fde8decb2345dc4acea87934.zip | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/i2c/other/ak4117.c')
| -rw-r--r-- | sound/i2c/other/ak4117.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c index b4b2a51fc117..40e33c9f2b09 100644 --- a/sound/i2c/other/ak4117.c +++ b/sound/i2c/other/ak4117.c @@ -380,7 +380,7 @@ static struct snd_kcontrol_new snd_ak4117_iec958_controls[] = { }, { .iface = SNDRV_CTL_ELEM_IFACE_PCM, - .name = "IEC958 Preample Capture Default", + .name = "IEC958 Preamble Capture Default", .access = SNDRV_CTL_ELEM_ACCESS_READ | SNDRV_CTL_ELEM_ACCESS_VOLATILE, .info = snd_ak4117_spdif_pinfo, .get = snd_ak4117_spdif_pget, |