diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-08-15 14:33:56 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-08-15 14:33:56 +0200 |
commit | 18c5ef385c65360761f39d55b2e2cd370ab151db (patch) | |
tree | 51ffa37ad94600f908867196dd9f216e42163de7 /sound/pci/hda/patch_nvhdmi.c | |
parent | 38d7b08f374b640b00d350ac2d12ffed5d723423 (diff) | |
parent | f0cea79724f03ee55e7b5933b6a6f6a3fd177710 (diff) |
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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c index 77e2b4028b9f..f636870dc718 100644 --- a/sound/pci/hda/patch_nvhdmi.c +++ b/sound/pci/hda/patch_nvhdmi.c @@ -347,10 +347,8 @@ static int nvhdmi_dig_playback_pcm_prepare_2ch(struct hda_pcm_stream *hinfo, static struct hda_pcm_stream nvhdmi_pcm_digital_playback_8ch_89 = { .substreams = 1, .channels_min = 2, - .rates = SUPPORTED_RATES, - .maxbps = SUPPORTED_MAXBPS, - .formats = SUPPORTED_FORMATS, .ops = { + .open = hdmi_pcm_open, .prepare = nvhdmi_dig_playback_pcm_prepare_8ch_89, .cleanup = nvhdmi_playback_pcm_cleanup, }, |