diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-08-23 08:47:06 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-08-23 08:47:06 +0200 |
commit | d2f927d42a87b712946dee72a0b96b6b6c6aff1d (patch) | |
tree | 879a34767b24e65569d24cb19490a4bdcb1beace /sound/pci/hda/patch_nvhdmi.c | |
parent | ALSA: intel8x0: Mute External Amplifier by default for ThinkPad X31 (diff) | |
parent | ALSA: hda - Add support for Lenovo S10-3t (diff) | |
download | linux-dev-d2f927d42a87b712946dee72a0b96b6b6c6aff1d.tar.xz linux-dev-d2f927d42a87b712946dee72a0b96b6b6c6aff1d.zip |
Merge branch 'fix/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_nvhdmi.c')
-rw-r--r-- | sound/pci/hda/patch_nvhdmi.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index f636870dc718..69b950d527c3 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c @@ -326,13 +326,6 @@ static int nvhdmi_dig_playback_pcm_prepare_8ch(struct hda_pcm_stream *hinfo, return 0; } -static int nvhdmi_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, - struct hda_codec *codec, - struct snd_pcm_substream *substream) -{ - return 0; -} - static int nvhdmi_dig_playback_pcm_prepare_2ch(struct hda_pcm_stream *hinfo, struct hda_codec *codec, unsigned int stream_tag, @@ -350,7 +343,6 @@ static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch_89 = { .ops = { .open = hdmi_pcm_open, .prepare = nvhdmi_dig_playback_pcm_prepare_8ch_89, - .cleanup = nvhdmi_playback_pcm_cleanup, }, }; |