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/ens1370.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/ens1370.c')
| -rw-r--r-- | sound/pci/ens1370.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c index 78a81f3912a1..f06b95f41a1d 100644 --- a/sound/pci/ens1370.c +++ b/sound/pci/ens1370.c | |||
| @@ -1444,7 +1444,7 @@ static int snd_es1371_spdif_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t | |||
| 1444 | 1444 | ||
| 1445 | /* spdif controls */ | 1445 | /* spdif controls */ |
| 1446 | static snd_kcontrol_new_t snd_es1371_mixer_spdif[] __devinitdata = { | 1446 | static snd_kcontrol_new_t snd_es1371_mixer_spdif[] __devinitdata = { |
| 1447 | ES1371_SPDIF("IEC958 Playback Switch"), | 1447 | ES1371_SPDIF(SNDRV_CTL_NAME_IEC958("",PLAYBACK,SWITCH)), |
| 1448 | { | 1448 | { |
| 1449 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, | 1449 | .iface = SNDRV_CTL_ELEM_IFACE_PCM, |
| 1450 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), | 1450 | .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), |