diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-13 05:59:26 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-13 05:59:26 -0500 |
| commit | c8a1a8985d705339a346203f26d2d6ff137f84c9 (patch) | |
| tree | e838790e6fb9b9a3ff0f08c465c3ec256dbcdf0c /sound/pci/hda/hda_local.h | |
| parent | 946835074e026f4bbe9f3c2b091dca6346bd1474 (diff) | |
| parent | 9411e21cd0cc4fd046b4f448417b0e103e80951c (diff) | |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/pci/hda/hda_local.h')
| -rw-r--r-- | sound/pci/hda/hda_local.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index 2ae6b53a4628..84e2cf644fd7 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
| @@ -254,6 +254,8 @@ int snd_hda_multi_out_dig_prepare(struct hda_codec *codec, | |||
| 254 | unsigned int stream_tag, | 254 | unsigned int stream_tag, |
| 255 | unsigned int format, | 255 | unsigned int format, |
| 256 | struct snd_pcm_substream *substream); | 256 | struct snd_pcm_substream *substream); |
| 257 | int snd_hda_multi_out_dig_cleanup(struct hda_codec *codec, | ||
| 258 | struct hda_multi_out *mout); | ||
| 257 | int snd_hda_multi_out_analog_open(struct hda_codec *codec, | 259 | int snd_hda_multi_out_analog_open(struct hda_codec *codec, |
| 258 | struct hda_multi_out *mout, | 260 | struct hda_multi_out *mout, |
| 259 | struct snd_pcm_substream *substream, | 261 | struct snd_pcm_substream *substream, |