diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 10:47:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-30 10:47:01 -0400 |
| commit | 444bd6fc18e4788f701a119cdfefe4f02444d9cb (patch) | |
| tree | 605ad11a825acf4bae9d98973becb3977ac2bae5 /sound/pci/hda/patch_analog.c | |
| parent | 3cb904caa97f5c193df21b8cdf780a826564baff (diff) | |
| parent | c88469704d63787e8d44ca5ea1c1bd0adc29572d (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
| -rw-r--r-- | sound/pci/hda/patch_analog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 2fd05bb84136..bceb83a42a38 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
| @@ -572,7 +572,7 @@ static snd_kcontrol_new_t ad1983_mixers[] = { | |||
| 572 | }, | 572 | }, |
| 573 | { | 573 | { |
| 574 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 574 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 575 | .name = "IEC958 Playback Route", | 575 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route", |
| 576 | .info = ad1983_spdif_route_info, | 576 | .info = ad1983_spdif_route_info, |
| 577 | .get = ad1983_spdif_route_get, | 577 | .get = ad1983_spdif_route_get, |
| 578 | .put = ad1983_spdif_route_put, | 578 | .put = ad1983_spdif_route_put, |
| @@ -705,7 +705,7 @@ static snd_kcontrol_new_t ad1981_mixers[] = { | |||
| 705 | /* identical with AD1983 */ | 705 | /* identical with AD1983 */ |
| 706 | { | 706 | { |
| 707 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, | 707 | .iface = SNDRV_CTL_ELEM_IFACE_MIXER, |
| 708 | .name = "IEC958 Playback Route", | 708 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,NONE) "Route", |
| 709 | .info = ad1983_spdif_route_info, | 709 | .info = ad1983_spdif_route_info, |
| 710 | .get = ad1983_spdif_route_get, | 710 | .get = ad1983_spdif_route_get, |
| 711 | .put = ad1983_spdif_route_put, | 711 | .put = ad1983_spdif_route_put, |